diff options
| author | Nathan Conrad <[email protected]> | 2019-09-19 19:54:37 -0400 |
|---|---|---|
| committer | Nathan Conrad <[email protected]> | 2019-09-19 19:56:00 -0400 |
| commit | d742c3e15cb2233e927d6fdc4702863dc41eb65a (patch) | |
| tree | acf8a6a840bd308ed0eeb1c8c4f3744b794ed63e | |
| parent | 7e0490bbf32ed4a25e1917a1e5856338b9dc9346 (diff) | |
s/USBTMC488/USB488/ ; fix types in bitfield
| -rw-r--r-- | src/class/usbtmc/usbtmc.h | 14 | ||||
| -rw-r--r-- | src/class/usbtmc/usbtmc_device.c | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/class/usbtmc/usbtmc.h b/src/class/usbtmc/usbtmc.h index 0944c907a..810b523c5 100644 --- a/src/class/usbtmc/usbtmc.h +++ b/src/class/usbtmc/usbtmc.h @@ -139,9 +139,9 @@ TU_VERIFY_STATIC(sizeof(usbtmc_msg_request_vendor_specific_in) == 12u, "struct w /* typedef struct TU_ATTR_PACKED { struct { - uint8_t Recipient : 5 ; ///< EOM set on last byte - uint8_t Type : 2 ; ///< EOM set on last byte - uint8_t DirectionToHost : 1 ; ///< 0 is OUT, 1 is IN + unsigned int Recipient : 5 ; ///< EOM set on last byte + unsigned int Type : 2 ; ///< EOM set on last byte + unsigned int DirectionToHost : 1 ; ///< 0 is OUT, 1 is IN } bmRequestType; uint8_t bRequest ; ///< If bmRequestType.Type = Class, see usmtmc_request_type_enum uint16_t wValue ; @@ -176,10 +176,10 @@ typedef enum { USBTMC_bREQUEST_INDICATOR_PULSE = 64u, // Optional /****** USBTMC 488 *************/ - USBTMC488_bREQUEST_READ_STATUS_BYTE = 128u, - USBTMC488_bREQUEST_REN_CONTROL = 160u, - USBTMC488_bREQUEST_GO_TO_LOCAL = 161u, - USBTMC488_bREQUEST_LOCAL_LOCKOUT = 162u, + USB488_bREQUEST_READ_STATUS_BYTE = 128u, + USB488_bREQUEST_REN_CONTROL = 160u, + USB488_bREQUEST_GO_TO_LOCAL = 161u, + USB488_bREQUEST_LOCAL_LOCKOUT = 162u, } usmtmc_request_type_enum; diff --git a/src/class/usbtmc/usbtmc_device.c b/src/class/usbtmc/usbtmc_device.c index f62bcd2b7..6306ab074 100644 --- a/src/class/usbtmc/usbtmc_device.c +++ b/src/class/usbtmc/usbtmc_device.c @@ -727,7 +727,7 @@ bool usbtmcd_control_request(uint8_t rhport, tusb_control_request_t const * requ #if (USBTMC_CFG_ENABLE_488) // USB488 required requests - case USBTMC488_bREQUEST_READ_STATUS_BYTE: + case USB488_bREQUEST_READ_STATUS_BYTE: { usbtmc_read_stb_rsp_488_t rsp; TU_VERIFY(request->bmRequestType == 0xA1); // in,class,interface @@ -763,9 +763,9 @@ bool usbtmcd_control_request(uint8_t rhport, tusb_control_request_t const * requ return true; } // USB488 optional requests - case USBTMC488_bREQUEST_REN_CONTROL: - case USBTMC488_bREQUEST_GO_TO_LOCAL: - case USBTMC488_bREQUEST_LOCAL_LOCKOUT: + case USB488_bREQUEST_REN_CONTROL: + case USB488_bREQUEST_GO_TO_LOCAL: + case USB488_bREQUEST_LOCAL_LOCKOUT: { TU_VERIFY(request->bmRequestType == 0xA1); // in,class,interface TU_VERIFY(false); |