qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 03:53:09 +02:00
Code

urjtag: compile fine with disable inb outb

Browse Source 
should be some replace code on inb/outb
not just define them as 0
This commit is contained in:
Xiangfu 2012-06-18 20:25:54 +08:00
parent ee4c2afefc
commit 67ac56b15b
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
urjtag/Makefile
View File

@ -26,7 +26,7 @@ define Package/urjtag
CATEGORY:=Utilities
TITLE:=Urjtag
URL:=http://urjtag.org/
DEPENDS:=+libusb-1.0 +libftdi $(INTL_DEPENDS)
DEPENDS:=+libusb +libusb-1.0 +libftdi $(INTL_DEPENDS) +libreadline +libncurses
endef
TARGET_CFLAGS += $(INTL_CFLAGS)
@ -41,7 +41,12 @@ CONFIGURE_ARGS += --with-libusb --with-libftdi --without-ftd2xx \
define Package/urjtag/install
$(INSTALL_DIR) \
$(1)/usr/bin/ \
$(1)/usr/share/urjtag/
$(1)/usr/share/urjtag/ \
$(1)/usr/lib/liburjtag/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jtag $(1)/usr/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/share/urjtag/* $(1)/usr/share/urjtag/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liburjtag.so.* $(1)/usr/lib/liburjtag/
endef
$(eval $(call BuildPackage,urjtag))

34
urjtag/patches/0001-disable-inb-outb.patch Normal file
View File

@ -0,0 +1,34 @@
diff --git a/urjtag/src/tap/parport/direct.c b/urjtag/src/tap/parport/direct.c
index 10bea4d..2be15b8 100644
--- a/urjtag/src/tap/parport/direct.c
+++ b/urjtag/src/tap/parport/direct.c
@@ -37,6 +37,20 @@
#include <urjtag/cable.h>
#include "../parport.h"
+#ifdef __linux__
+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) \
+|| defined(__powerpc__) || defined(__s390__) || defined(__s390x__)\
+|| defined(__mips__) || defined(__mc68000__) || defined(__sh__)
+
+#define NO_SYSIO
+
+#define inb(foo) 0
+#define outb(foo,bar) 0
+
+#endif /* architechtures */
+#endif /* __linux__ */
+
+
#if defined(HAVE_INPOUTXX)
static HINSTANCE inpout32_dll_handle = NULL;
@@ -50,7 +64,7 @@ static outfuncPtr Out32;
#define inb(p) (Inp32)(p)
#define outb(d,p) (Out32)(p,d)
-#elif defined(HAVE_IOPERM)
+#elif defined(HAVE_IOPERM) && !defined(NO_SYSIO)
#include <sys/io.h>