git.libre-soc.org Git - buildroot.git/blob

   1 From 5e0675efcec309617ba2d334c68ddb250ef942b2 Mon Sep 17 00:00:00 2001
   2 From: Peter Korsgaard <jacmet@sunsite.dk>
   3 Date: Fri, 27 Nov 2009 11:20:54 +0100
   4 Subject: [PATCH] scsi: use __uX types for headers exported to user space
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Commit 9e4f5e29 (FC Pass Thru support) exported a number of header files
  10 in include/scsi to user space, but didn't change the uX types to the
  11 userspace-compatible __uX types. Without that you'll get compile errors
  12 when including them - E.G.:
  13
  14 /tmp/include/scsi/scsi.h:145: error: expected specifier-qualifier-list
  15 before ‘u8’
  16
  17 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
  18 ---
  19  include/scsi/scsi.h         |    8 ++++----
  20  include/scsi/scsi_netlink.h |   20 ++++++++++----------
  21  2 files changed, 14 insertions(+), 14 deletions(-)
  22
  23 diff --git a/include/scsi/scsi.h b/include/scsi/scsi.h
  24 index 34c46ab..b3cffec 100644
  25 --- a/include/scsi/scsi.h
  26 +++ b/include/scsi/scsi.h
  27 @@ -145,10 +145,10 @@ struct scsi_cmnd;
  28
  29  /* defined in T10 SCSI Primary Commands-2 (SPC2) */
  30  struct scsi_varlen_cdb_hdr {
  31 -       u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
  32 -       u8 control;
  33 -       u8 misc[5];
  34 -       u8 additional_cdb_length;         /* total cdb length - 8 */
  35 +       __u8 opcode;        /* opcode always == VARIABLE_LENGTH_CMD */
  36 +       __u8 control;
  37 +       __u8 misc[5];
  38 +       __u8 additional_cdb_length;         /* total cdb length - 8 */
  39         __be16 service_action;
  40         /* service specific data follows */
  41  };
  42 diff --git a/include/scsi/scsi_netlink.h b/include/scsi/scsi_netlink.h
  43 index 536752c..7445c46 100644
  44 --- a/include/scsi/scsi_netlink.h
  45 +++ b/include/scsi/scsi_netlink.h
  46 @@ -105,8 +105,8 @@ struct scsi_nl_host_vendor_msg {
  47   *    PCI :  ID data is the 16 bit PCI Registered Vendor ID
  48   */
  49  #define SCSI_NL_VID_TYPE_SHIFT         56
  50 -#define SCSI_NL_VID_TYPE_MASK          ((u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
  51 -#define SCSI_NL_VID_TYPE_PCI           ((u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
  52 +#define SCSI_NL_VID_TYPE_MASK          ((__u64)0xFF << SCSI_NL_VID_TYPE_SHIFT)
  53 +#define SCSI_NL_VID_TYPE_PCI           ((__u64)0x01 << SCSI_NL_VID_TYPE_SHIFT)
  54  #define SCSI_NL_VID_ID_MASK            (~ SCSI_NL_VID_TYPE_MASK)
  55
  56
  57 @@ -125,21 +125,21 @@ struct scsi_nl_host_vendor_msg {
  58  #include <scsi/scsi_host.h>
  59
  60  /* Exported Kernel Interfaces */
  61 -int scsi_nl_add_transport(u8 tport,
  62 +int scsi_nl_add_transport(__u8 tport,
  63          int (*msg_handler)(struct sk_buff *),
  64         void (*event_handler)(struct notifier_block *, unsigned long, void *));
  65 -void scsi_nl_remove_transport(u8 tport);
  66 +void scsi_nl_remove_transport(__u8 tport);
  67
  68 -int scsi_nl_add_driver(u64 vendor_id, struct scsi_host_template *hostt,
  69 +int scsi_nl_add_driver(__u64 vendor_id, struct scsi_host_template *hostt,
  70         int (*nlmsg_handler)(struct Scsi_Host *shost, void *payload,
  71 -                                u32 len, u32 pid),
  72 +                                __u32 len, __u32 pid),
  73         void (*nlevt_handler)(struct notifier_block *nb,
  74                                  unsigned long event, void *notify_ptr));
  75 -void scsi_nl_remove_driver(u64 vendor_id);
  76 +void scsi_nl_remove_driver(__u64 vendor_id);
  77
  78 -void scsi_nl_send_transport_msg(u32 pid, struct scsi_nl_hdr *hdr);
  79 -int scsi_nl_send_vendor_msg(u32 pid, unsigned short host_no, u64 vendor_id,
  80 -                        char *data_buf, u32 data_len);
  81 +void scsi_nl_send_transport_msg(__u32 pid, struct scsi_nl_hdr *hdr);
  82 +int scsi_nl_send_vendor_msg(__u32 pid, unsigned short host_no, __u64 vendor_id,
  83 +                        char *data_buf, __u32 data_len);
  84
  85  #endif /* __KERNEL__ */
  86
  87 --
  88 1.6.5
  89