lkml.org 
[lkml]   [2008]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/4] HID: move usbhid flags to usbhid.h
    Date
    Move usbhid specific flags from global hid.h into local usbhid.h.

    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    ---
    drivers/hid/usbhid/usbhid.h | 10 ++++++++++
    include/linux/hid.h | 9 ---------
    2 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/drivers/hid/usbhid/usbhid.h b/drivers/hid/usbhid/usbhid.h
    index 332abcd..9eb3056 100644
    --- a/drivers/hid/usbhid/usbhid.h
    +++ b/drivers/hid/usbhid/usbhid.h
    @@ -40,6 +40,16 @@ int usbhid_open(struct hid_device *hid);
    void usbhid_init_reports(struct hid_device *hid);
    void usbhid_submit_report(struct hid_device *hid, struct hid_report *report, unsigned char dir);

    +/* iofl flags */
    +#define HID_CTRL_RUNNING 1
    +#define HID_OUT_RUNNING 2
    +#define HID_IN_RUNNING 3
    +#define HID_RESET_PENDING 4
    +#define HID_SUSPENDED 5
    +#define HID_CLEAR_HALT 6
    +#define HID_DISCONNECTED 7
    +#define HID_STARTED 8
    +
    /*
    * USB-specific HID struct, to be pointed to
    * from struct hid_device->driver_data
    diff --git a/include/linux/hid.h b/include/linux/hid.h
    index e5780f8..2c20f20 100644
    --- a/include/linux/hid.h
    +++ b/include/linux/hid.h
    @@ -403,15 +403,6 @@ struct hid_output_fifo {
    #define HID_STAT_ADDED 1
    #define HID_STAT_PARSED 2

    -#define HID_CTRL_RUNNING 1
    -#define HID_OUT_RUNNING 2
    -#define HID_IN_RUNNING 3
    -#define HID_RESET_PENDING 4
    -#define HID_SUSPENDED 5
    -#define HID_CLEAR_HALT 6
    -#define HID_DISCONNECTED 7
    -#define HID_STARTED 8
    -
    struct hid_input {
    struct list_head list;
    struct hid_report *report;
    --
    1.6.0.4


    \
     
     \ /
      Last update: 2008-11-24 16:23    [W:0.020 / U:88.784 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site