lkml.org 
[lkml]   [2016]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v05 10/72] scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h
    Date
    Fixes userspace compilation errors like:

    scsi/scsi_bsg_fc.h:83:2: error: unknown type name ‘uint8_t’

    Signed-off-by: Mikko Rapeli <mikko.rapeli@iki.fi>
    ---
    include/uapi/scsi/scsi_bsg_fc.h | 54 +++++++++++++++++++++--------------------
    1 file changed, 28 insertions(+), 26 deletions(-)

    diff --git a/include/uapi/scsi/scsi_bsg_fc.h b/include/uapi/scsi/scsi_bsg_fc.h
    index 3031b90..1a20447 100644
    --- a/include/uapi/scsi/scsi_bsg_fc.h
    +++ b/include/uapi/scsi/scsi_bsg_fc.h
    @@ -22,6 +22,8 @@
    #ifndef SCSI_BSG_FC_H
    #define SCSI_BSG_FC_H

    +#include <linux/types.h>
    +
    /*
    * This file intended to be included by both kernel and user space
    */
    @@ -80,10 +82,10 @@
    * with the transport upon completion of the login.
    */
    struct fc_bsg_host_add_rport {
    - uint8_t reserved;
    + __u8 reserved;

    /* FC Address Identier of the remote port to login to */
    - uint8_t port_id[3];
    + __u8 port_id[3];
    };

    /* Response:
    @@ -101,10 +103,10 @@ struct fc_bsg_host_add_rport {
    * remain logged in with the remote port.
    */
    struct fc_bsg_host_del_rport {
    - uint8_t reserved;
    + __u8 reserved;

    /* FC Address Identier of the remote port to logout of */
    - uint8_t port_id[3];
    + __u8 port_id[3];
    };

    /* Response:
    @@ -125,10 +127,10 @@ struct fc_bsg_host_els {
    * ELS Command Code being sent (must be the same as byte 0
    * of the payload)
    */
    - uint8_t command_code;
    + __u8 command_code;

    /* FC Address Identier of the remote port to send the ELS to */
    - uint8_t port_id[3];
    + __u8 port_id[3];
    };

    /* Response:
    @@ -165,14 +167,14 @@ struct fc_bsg_ctels_reply {
    * Note: x_RJT/BSY status will indicae that the rjt_data field
    * is valid and contains the reason/explanation values.
    */
    - uint32_t status; /* See FC_CTELS_STATUS_xxx */
    + __u32 status; /* See FC_CTELS_STATUS_xxx */

    /* valid if status is not FC_CTELS_STATUS_OK */
    struct {
    - uint8_t action; /* fragment_id for CT REJECT */
    - uint8_t reason_code;
    - uint8_t reason_explanation;
    - uint8_t vendor_unique;
    + __u8 action; /* fragment_id for CT REJECT */
    + __u8 reason_code;
    + __u8 reason_explanation;
    + __u8 vendor_unique;
    } rjt_data;
    };

    @@ -188,17 +190,17 @@ struct fc_bsg_ctels_reply {
    * and whether to tear it down after the request.
    */
    struct fc_bsg_host_ct {
    - uint8_t reserved;
    + __u8 reserved;

    /* FC Address Identier of the remote port to send the ELS to */
    - uint8_t port_id[3];
    + __u8 port_id[3];

    /*
    * We need words 0-2 of the generic preamble for the LLD's
    */
    - uint32_t preamble_word0; /* revision & IN_ID */
    - uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
    - uint32_t preamble_word2; /* Cmd Code, Max Size */
    + __u32 preamble_word0; /* revision & IN_ID */
    + __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
    + __u32 preamble_word2; /* Cmd Code, Max Size */

    };
    /* Response:
    @@ -218,17 +220,17 @@ struct fc_bsg_host_vendor {
    * Identifies the vendor that the message is formatted for. This
    * should be the recipient of the message.
    */
    - uint64_t vendor_id;
    + __u64 vendor_id;

    /* start of vendor command area */
    - uint32_t vendor_cmd[0];
    + __u32 vendor_cmd[0];
    };

    /* Response:
    */
    struct fc_bsg_host_vendor_reply {
    /* start of vendor response area */
    - uint32_t vendor_rsp[0];
    + __u32 vendor_rsp[0];
    };


    @@ -247,7 +249,7 @@ struct fc_bsg_rport_els {
    * ELS Command Code being sent (must be the same as
    * byte 0 of the payload)
    */
    - uint8_t els_code;
    + __u8 els_code;
    };

    /* Response:
    @@ -265,9 +267,9 @@ struct fc_bsg_rport_ct {
    /*
    * We need words 0-2 of the generic preamble for the LLD's
    */
    - uint32_t preamble_word0; /* revision & IN_ID */
    - uint32_t preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
    - uint32_t preamble_word2; /* Cmd Code, Max Size */
    + __u32 preamble_word0; /* revision & IN_ID */
    + __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
    + __u32 preamble_word2; /* Cmd Code, Max Size */
    };
    /* Response:
    *
    @@ -279,7 +281,7 @@ struct fc_bsg_rport_ct {

    /* request (CDB) structure of the sg_io_v4 */
    struct fc_bsg_request {
    - uint32_t msgcode;
    + __u32 msgcode;
    union {
    struct fc_bsg_host_add_rport h_addrport;
    struct fc_bsg_host_del_rport h_delrport;
    @@ -303,10 +305,10 @@ struct fc_bsg_reply {
    * msg and status fields. The per-msgcode reply structure
    * will contain valid data.
    */
    - uint32_t result;
    + __u32 result;

    /* If there was reply_payload, how much was recevied ? */
    - uint32_t reply_payload_rcv_len;
    + __u32 reply_payload_rcv_len;

    union {
    struct fc_bsg_host_vendor_reply vendor_reply;
    --
    2.8.1
    \
     
     \ /
      Last update: 2016-09-17 09:57    [W:5.209 / U:1.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site