Changeset 8033f89 in mainline for uspace/drv/bus/usb/xhci/hw_struct


Ignore:
Timestamp:
2018-01-23T12:41:22Z (8 years ago)
Author:
Ondřej Hlavatý <aearsis@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e7e1fd3
Parents:
e546142
Message:

xhci: cstyle

Location:
uspace/drv/bus/usb/xhci/hw_struct
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/xhci/hw_struct/common.h

    re546142 r8033f89  
    5959typedef volatile uint64_t xhci_qword_t __attribute__((aligned(8)));
    6060
    61 #define XHCI_DWORD_EXTRACT(field, hi, lo) (BIT_RANGE_EXTRACT(uint32_t, hi, lo, xhci2host(32, field)))
    62 #define XHCI_QWORD_EXTRACT(field, hi, lo) (BIT_RANGE_EXTRACT(uint64_t, hi, lo, xhci2host(64, field)))
     61#define XHCI_DWORD_EXTRACT(field, hi, lo) \
     62        (BIT_RANGE_EXTRACT(uint32_t, hi, lo, xhci2host(32, field)))
     63#define XHCI_QWORD_EXTRACT(field, hi, lo) \
     64        (BIT_RANGE_EXTRACT(uint64_t, hi, lo, xhci2host(64, field)))
    6365
    6466/**
    … …  
    6769 * Not thread-safe, proper synchronization over this dword must be assured.
    6870 */
    69 static inline void xhci_dword_set_bits(xhci_dword_t *storage, uint32_t value, unsigned hi, unsigned lo)
     71static inline void xhci_dword_set_bits(xhci_dword_t *storage, uint32_t value,
     72        unsigned hi, unsigned lo)
    7073{
    7174        const uint32_t mask = host2xhci(32, BIT_RANGE(uint32_t, hi, lo));
    … …  
    8285}
    8386
    84 static inline void xhci_qword_set_bits(xhci_qword_t *storage, uint64_t value, unsigned hi, unsigned lo)
     87static inline void xhci_qword_set_bits(xhci_qword_t *storage, uint64_t value,
     88        unsigned hi, unsigned lo)
    8589{
    8690        const uint64_t mask = host2xhci(64, BIT_RANGE(uint64_t, hi, lo));
    … …  
    8993}
    9094
    91 static inline int xhci_reg_wait(xhci_dword_t *reg, uint32_t mask, uint32_t expected)
     95static inline int xhci_reg_wait(xhci_dword_t *reg, uint32_t mask,
     96        uint32_t expected)
    9297{
    9398        mask = host2xhci(32, mask);

  • uspace/drv/bus/usb/xhci/hw_struct/regs.h

    re546142 r8033f89  
    8484 * Field handling is the easiest. Just do it with whole field.
    8585 */
    86 #define XHCI_REG_RD_FIELD(ptr, size)         xhci2host(size, pio_read_##size((ptr)))
    87 #define XHCI_REG_WR_FIELD(ptr, value, size)  pio_write_##size((ptr), host2xhci(size, value))
    88 #define XHCI_REG_SET_FIELD(ptr, value, size) pio_set_##size((ptr), host2xhci(size, value), XHCI_PIO_CHANGE_UDELAY);
    89 #define XHCI_REG_CLR_FIELD(ptr, value, size) pio_clear_##size((ptr), host2xhci(size, value), XHCI_PIO_CHANGE_UDELAY);
     86#define XHCI_REG_RD_FIELD(ptr, size) \
     87        xhci2host(size, pio_read_##size((ptr)))
     88#define XHCI_REG_WR_FIELD(ptr, value, size) \
     89        pio_write_##size((ptr), host2xhci(size, value))
     90#define XHCI_REG_SET_FIELD(ptr, value, size) \
     91        pio_set_##size((ptr), host2xhci(size, value), XHCI_PIO_CHANGE_UDELAY);
     92#define XHCI_REG_CLR_FIELD(ptr, value, size) \
     93        pio_clear_##size((ptr), host2xhci(size, value), XHCI_PIO_CHANGE_UDELAY);
    9094#define XHCI_REG_MASK_FIELD(size)            (~((uint##size##_t) 0))
    9195#define XHCI_REG_SHIFT_FIELD(size)           (0)
    … …  
    9498 * Flags are just trivial case of ranges.
    9599 */
    96 #define XHCI_REG_RD_FLAG(ptr, size, offset)         XHCI_REG_RD_RANGE((ptr), size, (offset), (offset))
    97 #define XHCI_REG_WR_FLAG(ptr, value, size, offset)  XHCI_REG_WR_RANGE((ptr), (value), size, (offset), (offset))
    98 #define XHCI_REG_SET_FLAG(ptr, value, size, offset) XHCI_REG_SET_RANGE((ptr), (value), size, (offset), (offset))
    99 #define XHCI_REG_CLR_FLAG(ptr, value, size, offset) XHCI_REG_CLR_RANGE((ptr), (value), size, (offset), (offset))
     100#define XHCI_REG_RD_FLAG(ptr, size, offset) \
     101        XHCI_REG_RD_RANGE((ptr), size, (offset), (offset))
     102#define XHCI_REG_WR_FLAG(ptr, value, size, offset) \
     103        XHCI_REG_WR_RANGE((ptr), (value), size, (offset), (offset))
     104#define XHCI_REG_SET_FLAG(ptr, value, size, offset) \
     105        XHCI_REG_SET_RANGE((ptr), (value), size, (offset), (offset))
     106#define XHCI_REG_CLR_FLAG(ptr, value, size, offset) \
     107        XHCI_REG_CLR_RANGE((ptr), (value), size, (offset), (offset))
    100108#define XHCI_REG_MASK_FLAG(size, offset)            BIT_V(uint##size##_t, offset)
    101109#define XHCI_REG_SHIFT_FLAG(size, offset)           (offset)
    … …  
    108116
    109117#define XHCI_REG_WR_RANGE(ptr, value, size, hi, lo) \
    110         pio_change_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, (hi), (lo), (value))), \
     118        pio_change_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, \
     119                        (hi), (lo), (value))), \
    111120                host2xhci(size, BIT_RANGE(uint##size##_t, (hi), (lo))), \
    112121                XHCI_PIO_CHANGE_UDELAY);
    113122
    114123#define XHCI_REG_SET_RANGE(ptr, value, size, hi, lo) \
    115         pio_set_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, (hi), (lo), (value))), \
     124        pio_set_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, \
     125                        (hi), (lo), (value))), \
    116126                XHCI_PIO_CHANGE_UDELAY);
    117127
    118128#define XHCI_REG_CLR_RANGE(ptr, value, size, hi, lo) \
    119         pio_clear_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, (hi), (lo), (value))), \
     129        pio_clear_##size((ptr), host2xhci(size, BIT_RANGE_INSERT(uint##size##_t, \
     130                        (hi), (lo), (value))), \
    120131                XHCI_PIO_CHANGE_UDELAY);
    121132
    … …  
    409420#define XHCI_OP_CA             crcr_lo, 32,  FLAG, 2
    410421#define XHCI_OP_CRR            crcr_lo, 32,  FLAG, 3
    411 /* This shall be RANGE, 6, 0, but the value containing CR pointer and RCS flag
    412  * must be written at once. */
     422/*
     423 * This shall be RANGE, 6, 0, but the value containing CR pointer and RCS flag
     424 * must be written at once.
     425 */
    413426#define XHCI_OP_CRCR_LO        crcr_lo, 32, FIELD
    414427#define XHCI_OP_CRCR_HI        crcr_hi, 32, FIELD
    … …  
    466479#define XHCI_INTR_ERDP_ESI     erdp_lo, 32, RANGE,  2, 0
    467480#define XHCI_INTR_ERDP_EHB     erdp_lo, 32,  FLAG,  3
    468 // TODO: ERDP_LO is supposed to be RANGE 31, 4 (section 5.5.2.3.3).
    469481#define XHCI_INTR_ERDP_LO      erdp_lo, 32, FIELD
    470482#define XHCI_INTR_ERDP_HI      erdp_hi, 32, FIELD
    … …  
    532544} xhci_extcap_t;
    533545
    534 #define XHCI_EC_CAP_ID                           header, 32, RANGE,  7,  0
    535 #define XHCI_EC_SIZE                             header, 32, RANGE, 15,  8
     546#define XHCI_EC_CAP_ID                  header, 32, RANGE,  7,  0
     547#define XHCI_EC_SIZE                    header, 32, RANGE, 15,  8
    536548
    537549/* Supported protocol */
    538 #define XHCI_EC_SP_MINOR                         header, 32, RANGE, 23, 16
    539 #define XHCI_EC_SP_MAJOR                         header, 32, RANGE, 31, 24
    540 #define XHCI_EC_SP_NAME                 cap_specific[0], 32, FIELD
    541 #define XHCI_EC_SP_CP_OFF               cap_specific[1], 32, RANGE,  7,  0
    542 #define XHCI_EC_SP_CP_COUNT             cap_specific[1], 32, RANGE, 15,  8
    543 #define XHCI_EC_SP_PSIC                 cap_specific[1], 32, RANGE, 31, 28
    544 #define XHCI_EC_SP_SLOT_TYPE            cap_specific[2], 32, RANGE,  4,  0
     550#define XHCI_EC_SP_MINOR                header, 32, RANGE, 23, 16
     551#define XHCI_EC_SP_MAJOR                header, 32, RANGE, 31, 24
     552#define XHCI_EC_SP_NAME        cap_specific[0], 32, FIELD
     553#define XHCI_EC_SP_CP_OFF      cap_specific[1], 32, RANGE,  7,  0
     554#define XHCI_EC_SP_CP_COUNT    cap_specific[1], 32, RANGE, 15,  8
     555#define XHCI_EC_SP_PSIC        cap_specific[1], 32, RANGE, 31, 28
     556#define XHCI_EC_SP_SLOT_TYPE   cap_specific[2], 32, RANGE,  4,  0
    545557
    546558typedef union {
    … …  
    582594        ioport8_t sem_os;
    583595
    584         xhci_dword_t usblegctlsts;      /**< USB Legacy Support Control/Status - RW for BIOS, RO for OS */
     596        /** USB Legacy Support Control/Status - RW for BIOS, RO for OS */
     597        xhci_dword_t usblegctlsts;
    585598} xhci_legsup_t;
    586599
    … …  
    588601#define XHCI_LEGSUP_SEM_OS      sem_os, 8, FLAG, 0
    589602
    590 #define XHCI_LEGSUP_POLLING_DELAY_1MS   1000
    591 #define XHCI_LEGSUP_BIOS_TIMEOUT_US     1000000 /* 4.22.1 BIOS may take up to 1 second to release the device */
     603/* 4.22.1 BIOS may take up to 1 second to release the device */
     604#define XHCI_LEGSUP_BIOS_TIMEOUT_US   1000000
     605#define XHCI_LEGSUP_POLLING_DELAY_1MS    1000
    592606
    593607#endif

  • uspace/drv/bus/usb/xhci/hw_struct/trb.h

    re546142 r8033f89  
    208208} xhci_erst_entry_t;
    209209
    210 static inline void xhci_fill_erst_entry(xhci_erst_entry_t *entry, uintptr_t phys, int segments)
     210static inline void xhci_fill_erst_entry(xhci_erst_entry_t *entry,
     211    uintptr_t phys, int segments)
    211212{
    212213        xhci_qword_set(&entry->rs_base_ptr, phys);
Note: See TracChangeset for help on using the changeset viewer.