Skip to content

Commit

Permalink
Since I can only build for 64-bit, HoRNDIS is 64-bit-only. Check for …
Browse files Browse the repository at this point in the history
…that in the installer. Closes #3.
  • Loading branch information
jwise committed Dec 1, 2012
1 parent 4e7e072 commit d8bf099
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions HoRNDIS.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions HoRNDIS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion package/HoRNDIS.pmdoc/index.xml
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit d8bf099

Please sign in to comment.