Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Since I can only build for 64-bit, HoRNDIS is 64-bit-only. Check for …

…that in the installer. Closes #3.
  • Loading branch information...
commit d8bf099cc55caebf535323ef88ccf516f279c179 1 parent 4e7e072
@jwise authored
View
5 HoRNDIS.cpp
@@ -581,7 +581,7 @@ UInt32 HoRNDIS::outputPacket(mbuf_t packet, void *param) {
/* Find an output buffer in the pool */
IOLockLock(outbuf_lock);
for (i = 0; i < OUT_BUF_MAX_TRIES; i++) {
- AbsoluteTime ivl, deadl;
+ uint64_t ivl, deadl;
for (poolIndx = 0; poolIndx < N_OUT_BUFS; poolIndx++)
if (!outbufs[poolIndx].inuse) {
@@ -595,7 +595,8 @@ UInt32 HoRNDIS::outputPacket(mbuf_t packet, void *param) {
nanoseconds_to_absolutetime(OUT_BUF_WAIT_TIME, &ivl);
clock_absolutetime_interval_to_deadline(ivl, &deadl);
LOG(V_NOTE, "waiting for buffer...");
- IOLockSleepDeadline(outbuf_lock, outbufs, deadl, THREAD_INTERRUPTIBLE);
+
+ IOLockSleepDeadline(outbuf_lock, outbufs, *(AbsoluteTime *)&deadl, THREAD_INTERRUPTIBLE);
}
IOLockUnlock(outbuf_lock);
View
8 HoRNDIS.xcodeproj/project.pbxproj
@@ -192,7 +192,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_EMPTY_BODY = YES;
@@ -221,7 +221,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_WARN_EMPTY_BODY = YES;
@@ -242,7 +242,7 @@
42BCD8B81645AFC500683BF7 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.0.0d1;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -261,7 +261,7 @@
42BCD8B91645AFC500683BF7 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = "$(ARCHS_STANDARD_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1.0.0d1;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
View
2  package/HoRNDIS.pmdoc/index.xml
@@ -1 +1 @@
-<pkmkdoc spec="1.12"><properties><title>HoRNDIS</title><build>/Users/joshua/projects/horndis/HoRNDIS/HoRNDIS.pkg</build><organization>com.joshuawise</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>HoRNDIS is a kernel extension ("kext") that allows you to use your Android phone's built-in USB tethering support.</description><contents><choice title="HoRNDIS Kernel Extension" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.joshuawise.kexts.HoRNDIS.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="license">../COPYING.rtf</resource><resource relative="true" mod="true" type="welcome">intro-text.rtf</resource><resource relative="true" mod="true" type="conclusion">post-readme.rtf</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6'"><message-title>Failure</message-title><message>HoRNDIS supports only Snow Leopard and newer systems.</message></requirement></requirements><flags/><postinstall><action id="com.apple.packagemaker.actions.loadkext"><value>com.joshuawise.kexts.HoRNDIS</value><type>component</type></action></postinstall><extra-files/><item type="file">01horndis.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.systemDomain</mod><mod>properties.userDomain</mod><mod>postinstallActions.actions</mod><mod>extraFiles</mod><mod>properties.customizeOption</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+<pkmkdoc spec="1.12"><properties><title>HoRNDIS</title><build>/Users/joshua/projects/horndis/HoRNDIS/HoRNDIS.pkg</build><organization>com.joshuawise</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>HoRNDIS is a kernel extension ("kext") that allows you to use your Android phone's built-in USB tethering support.</description><contents><choice title="HoRNDIS Kernel Extension" id="choice2" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="com.joshuawise.kexts.HoRNDIS.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource relative="true" mod="true" type="license">../COPYING.rtf</resource><resource relative="true" mod="true" type="welcome">intro-text.rtf</resource><resource relative="true" mod="true" type="conclusion">post-readme.rtf</resource></locale></resources><requirements><requirement id="tosv" operator="ge" value="'10.6'"><message-title>Failure</message-title><message>HoRNDIS supports only Snow Leopard and newer systems.</message></requirement><requirement id="sysc" operator="eq" value="'x86_64'"><argument>hw.machine</argument><message-title>64-bit kernel needed</message-title><message>HoRNDIS requires a 64-bit kernel to run. For more information, visit: http://joshuawise.com/horndis#64bit</message></requirement></requirements><flags/><postinstall><action id="com.apple.packagemaker.actions.loadkext"><value>com.joshuawise.kexts.HoRNDIS</value><type>component</type></action></postinstall><extra-files/><item type="file">01horndis.xml</item><mod>description</mod><mod>properties.title</mod><mod>properties.anywhereDomain</mod><mod>properties.userDomain</mod><mod>postinstallActions.actions</mod><mod>extraFiles</mod><mod>properties.customizeOption</mod><mod>properties.systemDomain</mod></pkmkdoc>
Please sign in to comment.
Something went wrong with that request. Please try again.