r2200 - trunk/src/host/qemu-neo1973

[andrew at sita.openmoko.org]

Author: andrew
Date: 2007-06-09 12:09:17 +0200 (Sat, 09 Jun 2007)
New Revision: 2200

Modified:
   trunk/src/host/qemu-neo1973/configure
   trunk/src/host/qemu-neo1973/usb-linux-gadget.c
Log:
Check linux-headers version and include only headers appropriate for given version.
Fixes http://bugzilla.openmoko.org/cgi-bin/bugzilla/show_bug.cgi?id=592


Modified: trunk/src/host/qemu-neo1973/configure
===================================================================
--- trunk/src/host/qemu-neo1973/configure	2007-06-09 00:09:10 UTC (rev 2199)
+++ trunk/src/host/qemu-neo1973/configure	2007-06-09 10:09:17 UTC (rev 2200)
@@ -632,8 +632,36 @@
 # usb_gadgetfs headers
 
 cat > $TMPC << EOF
-#include <linux/usb_ch9.h>
-#include <linux/usb_gadgetfs.h>
+/* usb-linux-gadget.c */
+#include <stdlib.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+# include <linux/usb_ch9.h>
+# include <linux/usb_gadgetfs.h>
+#else
+# include <linux/usb/ch9.h>
+# include <linux/usb_gadgetfs.h>
+#endif
+#include <poll.h>
+#include <signal.h>
+
+/* vl.h */
+# include <stdlib.h>
+# include <stdio.h>
+# include <stdarg.h>
+# include <string.h>
+# include <inttypes.h>
+# include <limits.h>
+# include <time.h>
+# include <ctype.h>
+# include <errno.h>
+# include <unistd.h>
+# include <fcntl.h>
+# include <sys/stat.h>
+
+/* hw/usb.h */
+# define USB_SPEED_LOW			0
+
 int main(void) { return 0; }
 EOF
 if $cc -o $TMPE $TMPC 2> /dev/null ; then

Modified: trunk/src/host/qemu-neo1973/usb-linux-gadget.c
===================================================================
--- trunk/src/host/qemu-neo1973/usb-linux-gadget.c	2007-06-09 00:09:10 UTC (rev 2199)
+++ trunk/src/host/qemu-neo1973/usb-linux-gadget.c	2007-06-09 10:09:17 UTC (rev 2200)
@@ -21,15 +21,22 @@
  */
 #include "config-host.h"
 #if defined(CONFIG_GADGETFS)
-#include <linux/usb_ch9.h>
-#include <linux/usb_gadgetfs.h>
-#include <poll.h>
-#include <signal.h>
+# include <stdlib.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 21)
+#  include <linux/usb_ch9.h>
+#  include <linux/usb_gadgetfs.h>
+# else
+#  include <linux/usb/ch9.h>
+#  include <linux/usb_gadgetfs.h>
+# endif
+# include <poll.h>
+# include <signal.h>
 
 /* Must be after usb_ch9.h */
-#include "vl.h"
+# include "vl.h"
 
-#define USBGADGETFS_PATH "/dev/gadget"
+# define USBGADGETFS_PATH "/dev/gadget"
 
 struct gadget_state_s {
     USBPort port;
@@ -804,7 +811,7 @@
 }
 
 #else
-#include "vl.h"
+# include "vl.h"
 
 int usb_gadget_init(void)
 {