[patch] Patch to make nomad-tools compile with 2.6 kernels.

nomad-tool.patch (text/plain), 2.94 KB, created by Edward Perkins on 2005-09-18 11:17:06 UTC

diff -rc nomad-tool/nomad-tool.c nomad-tool_patched/nomad-tool.c
*** nomad-tool/nomad-tool.c	Thu Apr  4 06:11:45 2002
--- nomad-tool_patched/nomad-tool.c	Sun Sep 18 17:57:10 2005
***************
*** 43,51 ****
  #include "control.h"
  #include "utf16.h"
  
  #define PROGRAM_VERSION "1.3"
  #define PROGRESS_UNITS 50	/* Must be a multiple of 10.  */
! 
  typedef void command_t (nomadiimg_t *, const char **, unsigned int);
  
  struct command_entry
--- 43,52 ----
  #include "control.h"
  #include "utf16.h"
  
+ 
  #define PROGRAM_VERSION "1.3"
  #define PROGRESS_UNITS 50	/* Must be a multiple of 10.  */
! 
  typedef void command_t (nomadiimg_t *, const char **, unsigned int);
  
  struct command_entry
diff -rc nomad-tool/nomadiimg.c nomad-tool_patched/nomadiimg.c
*** nomad-tool/nomadiimg.c	Fri Apr  5 04:51:29 2002
--- nomad-tool_patched/nomadiimg.c	Sun Sep 18 18:08:08 2005
***************
*** 43,48 ****
--- 43,49 ----
  #include <linux/usbdevice_fs.h>
  #include <linux/usb.h>
  
+ #include <linux/version.h>
  #include "nomadiimg.h"
  
  #if 0
***************
*** 683,689 ****
      return (result);
    }
  }
! 
  static int
  get_result (nomadiimg_t * n)
  {
--- 684,690 ----
      return (result);
    }
  }
! 
  static int
  get_result (nomadiimg_t * n)
  {
***************
*** 726,732 ****
  {
    printf ("%s: %s\n", s, (n -> errstr));
  }
! 
  /* USB transfers */
  
  static int
--- 727,733 ----
  {
    printf ("%s: %s\n", s, (n -> errstr));
  }
! 
  /* USB transfers */
  
  static int
***************
*** 779,790 ****
  	       (dir_string (direction)), req, value, index, timeout, length);
      }
  
    (a . requesttype) = (USB_TYPE_VENDOR | direction | USB_RECIP_OTHER);
    (a . request) = req;
    (a . value) = value;
    (a . index) = index;
-   (a . timeout) = timeout;
    (a . length) = length;
    (a . data) = data;
    ret = (ioctl ((n -> fd), USBDEVFS_CONTROL, (&a)));
  
--- 780,805 ----
  	       (dir_string (direction)), req, value, index, timeout, length);
      }
  
+   // Edward Perkins, <[e-mail]>, code added to handle 2.6 kernels.
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
+   (a . bRequestType) = (USB_TYPE_VENDOR | direction | USB_RECIP_OTHER);
+   (a . bRequest) = req;
+   (a . wValue) = value;
+   (a . wIndex) = index;
+   (a . wLength) = length;
+ #endif
+ 
+ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) && LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0))
    (a . requesttype) = (USB_TYPE_VENDOR | direction | USB_RECIP_OTHER);
    (a . request) = req;
    (a . value) = value;
    (a . index) = index;
    (a . length) = length;
+ #endif
+ 
+ 
+   (a . timeout) = timeout;
    (a . data) = data;
    ret = (ioctl ((n -> fd), USBDEVFS_CONTROL, (&a)));
  
***************
*** 804,810 ****
      }
    return (0);
  }
! 
  static int
  bulk_in (nomadiimg_t * n, unsigned int length, void * data)
  {
--- 819,825 ----
      }
    return (0);
  }
! 
  static int
  bulk_in (nomadiimg_t * n, unsigned int length, void * data)
  {