Date:2012-06-18 14:25:54 (11 years 9 months ago)
Author:Xiangfu
Commit:67ac56b15ba4b6dd8ce060308b608d394f48a753
Message:urjtag: compile fine with disable inb outb should be some replace code on inb/outb not just define them as 0

Files: urjtag/Makefile (2 diffs)
urjtag/patches/0001-disable-inb-outb.patch (1 diff)

Change Details

urjtag/Makefile
2626  CATEGORY:=Utilities
2727  TITLE:=Urjtag
2828  URL:=http://urjtag.org/
29  DEPENDS:=+libusb-1.0 +libftdi $(INTL_DEPENDS)
29  DEPENDS:=+libusb +libusb-1.0 +libftdi $(INTL_DEPENDS) +libreadline +libncurses
3030endef
3131
3232TARGET_CFLAGS += $(INTL_CFLAGS)
...... 
4141define Package/urjtag/install
4242    $(INSTALL_DIR) \
4343        $(1)/usr/bin/ \
44        $(1)/usr/share/urjtag/
44        $(1)/usr/share/urjtag/ \
45        $(1)/usr/lib/liburjtag/
46
47    $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/jtag $(1)/usr/bin/
48    $(CP) $(PKG_INSTALL_DIR)/usr/share/urjtag/* $(1)/usr/share/urjtag/
49    $(CP) $(PKG_INSTALL_DIR)/usr/lib/liburjtag.so.* $(1)/usr/lib/liburjtag/
4550endef
4651
4752$(eval $(call BuildPackage,urjtag))
urjtag/patches/0001-disable-inb-outb.patch
1diff --git a/urjtag/src/tap/parport/direct.c b/urjtag/src/tap/parport/direct.c
2index 10bea4d..2be15b8 100644
3--- a/urjtag/src/tap/parport/direct.c
4@@ -37,6 +37,20 @@
5 #include <urjtag/cable.h>
6 #include "../parport.h"
7
8+#ifdef __linux__
9+#if defined(arm) || defined(__hppa__) || defined(__sparc__) || defined(__ppc__) \
10+|| defined(__powerpc__) || defined(__s390__) || defined(__s390x__)\
11+|| defined(__mips__) || defined(__mc68000__) || defined(__sh__)
12+
13+#define NO_SYSIO
14+
15+#define inb(foo) 0
16+#define outb(foo,bar) 0
17+
18+#endif /* architechtures */
19+#endif /* __linux__ */
20+
21+
22 #if defined(HAVE_INPOUTXX)
23
24 static HINSTANCE inpout32_dll_handle = NULL;
25@@ -50,7 +64,7 @@ static outfuncPtr Out32;
26 #define inb(p) (Inp32)(p)
27 #define outb(d,p) (Out32)(p,d)
28
29-#elif defined(HAVE_IOPERM)
30+#elif defined(HAVE_IOPERM) && !defined(NO_SYSIO)
31
32 #include <sys/io.h>
33

Archive Download the corresponding diff file



interactive