File fxload-2002_04_11.dif of Package fxload

Overview Repositories Revisions Requests Users Attributes Meta

File fxload-2002_04_11.dif of Package fxload (Revision eb1a70b88256916f1d0eb720b9e2a312)

Currently displaying revision eb1a70b88256916f1d0eb720b9e2a312 , Show latest

---
 Makefile |   14 ++++++++------
 ezusb.c  |   16 ++--------------
 2 files changed, 10 insertions(+), 20 deletions(-)

Index: ezusb.c
===================================================================
--- ezusb.c.orig
+++ ezusb.c
@@ -27,10 +27,9 @@
 # include  <string.h>
 
 # include  <sys/ioctl.h>
-
-# include  <linux/version.h>
-# include  <linux/usb.h>
+# include  <linux/compiler.h>
 # include  <linux/usbdevice_fs.h>
+# include  <linux/usb_ch9.h>
 
 # include "ezusb.h"
 
@@ -95,17 +94,6 @@ static int fx2_is_external (unsigned sho
 
 /*****************************************************************************/
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,3)
-/*
- * in 2.5, "struct usbdevfs_ctrltransfer" fields were renamed
- * to match the USB spec
- */
-#	define bRequestType	requesttype
-#	define bRequest		request
-#	define wValue		value
-#	define wIndex		index
-#	define wLength		length
-#endif
 
 /*
  * Issue a control request to the specified device.
Index: Makefile
===================================================================
--- Makefile.orig
+++ Makefile
@@ -3,10 +3,12 @@
 # Builds "fxload" binaries, distribution tarball, and RPMs.
 #
 
-prefix =		/
+prefix =		/usr
 exec_prefix =		${prefix}
-sbindir =		${exec_prefix}/sbin
-mandir =		${prefix}/usr/share/man
+sbindir =		/sbin
+mandir =		${prefix}/share/man
+
+DESTDIR =
 
 INSTALL =		/usr/bin/install -cD
 INSTALL_PROGRAM =	${INSTALL}
@@ -59,9 +61,9 @@ clean:
 
 # install, from tarball or for binary RPM
 install: $(PROG)
-	$(INSTALL_PROGRAM) $(PROG) $(sbindir)/$(PROG)
-	$(INSTALL_PROGRAM) -m 0644 $(PROG).8 $(mandir)/man8/$(PROG).8
-	$(INSTALL_PROGRAM) -m 0644 a3load.hex $(prefix)/usr/share/usb/a3load.hex
+	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(sbindir)/$(PROG)
+	$(INSTALL_PROGRAM) -m 0644 $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8
+	$(INSTALL_PROGRAM) -m 0644 a3load.hex $(DESTDIR)/usr/share/usb/a3load.hex
 
 
 # make a source tarball

Places

File fxload-2002_04_11.dif of Package fxload (Revision eb1a70b88256916f1d0eb720b9e2a312)

Places