lkml.org 
[lkml]   [2011]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/2] xhci: Add defines for hardcoded slot states
    Date
    Signed-off-by: Maarten Lankhorst <m.b.lankhorst@gmail.com>
    ---
    drivers/usb/host/xhci-dbg.c | 8 ++++----
    drivers/usb/host/xhci.h | 5 +++++
    2 files changed, 9 insertions(+), 4 deletions(-)

    diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
    index 2e04861..1f50b44 100644
    --- a/drivers/usb/host/xhci-dbg.c
    +++ b/drivers/usb/host/xhci-dbg.c
    @@ -438,13 +438,13 @@ char *xhci_get_slot_state(struct xhci_hcd *xhci,
    struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx);

    switch (GET_SLOT_STATE(le32_to_cpu(slot_ctx->dev_state))) {
    - case 0:
    + case SLOT_STATE_ENABLED:
    return "enabled/disabled";
    - case 1:
    + case SLOT_STATE_DEFAULT:
    return "default";
    - case 2:
    + case SLOT_STATE_ADDRESSED:
    return "addressed";
    - case 3:
    + case SLOT_STATE_CONFIGURED:
    return "configured";
    default:
    return "reserved";
    diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
    index ac0196e..bbc1d9a 100644
    --- a/drivers/usb/host/xhci.h
    +++ b/drivers/usb/host/xhci.h
    @@ -560,6 +560,11 @@ struct xhci_slot_ctx {
    #define SLOT_STATE (0x1f << 27)
    #define GET_SLOT_STATE(p) (((p) & (0x1f << 27)) >> 27)

    +#define SLOT_STATE_DISABLED 0
    +#define SLOT_STATE_ENABLED SLOT_STATE_DISABLED
    +#define SLOT_STATE_DEFAULT 1
    +#define SLOT_STATE_ADDRESSED 2
    +#define SLOT_STATE_CONFIGURED 3

    /**
    * struct xhci_ep_ctx
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-06-01 23:31    [W:0.022 / U:91.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site