Skip to content

Commit ce7bffb

Browse files
committed
more update
1 parent bfb631c commit ce7bffb

File tree

6 files changed

+23
-24
lines changed

6 files changed

+23
-24
lines changed

src/arduino/cdc/Adafruit_USBH_CDC.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030

3131
#include "Adafruit_USBH_CDC.h"
3232

33-
Adafruit_USBH_CDC::Adafruit_USBH_CDC(void) { _idx = TUSB_INDEX_INVALID; }
33+
Adafruit_USBH_CDC::Adafruit_USBH_CDC(void) { _idx = TUSB_INDEX_INVALID_8; }
3434

3535
void Adafruit_USBH_CDC::begin(unsigned long baud) {
3636

3737
// default to index 0 when begin
38-
if (_idx == TUSB_INDEX_INVALID) {
38+
if (_idx == TUSB_INDEX_INVALID_8) {
3939
_idx = 0;
4040
}
4141

@@ -50,14 +50,14 @@ void Adafruit_USBH_CDC::begin(unsigned long baudrate, uint16_t config) {
5050
begin(baudrate);
5151
}
5252

53-
void Adafruit_USBH_CDC::end(void) { _idx = TUSB_INDEX_INVALID; }
53+
void Adafruit_USBH_CDC::end(void) { _idx = TUSB_INDEX_INVALID_8; }
5454

5555
bool Adafruit_USBH_CDC::connected(void) {
56-
return (_idx != TUSB_INDEX_INVALID) && tuh_cdc_connected(_idx);
56+
return (_idx != TUSB_INDEX_INVALID_8) && tuh_cdc_connected(_idx);
5757
}
5858

5959
bool Adafruit_USBH_CDC::mounted(void) {
60-
return (_idx != TUSB_INDEX_INVALID) && tuh_cdc_mounted(_idx);
60+
return (_idx != TUSB_INDEX_INVALID_8) && tuh_cdc_mounted(_idx);
6161
}
6262

6363
int Adafruit_USBH_CDC::available(void) {

src/class/cdc/cdc_host.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ static inline uint8_t get_idx_by_ep_addr(uint8_t daddr, uint8_t ep_addr)
9797
}
9898
}
9999

100-
return TU_INDEX_INVALID_8;
100+
return TUSB_INDEX_INVALID_8;
101101
}
102102

103103

@@ -124,7 +124,7 @@ uint8_t tuh_cdc_itf_get_index(uint8_t daddr, uint8_t itf_num)
124124
if (p_cdc->daddr == daddr && p_cdc->bInterfaceNumber == itf_num) return i;
125125
}
126126

127-
return TU_INDEX_INVALID_8;
127+
return TUSB_INDEX_INVALID_8;
128128
}
129129

130130
bool tuh_cdc_itf_get_info(uint8_t idx, tuh_cdc_itf_info_t* info)
@@ -533,7 +533,7 @@ static void process_cdc_config(tuh_xfer_t* xfer)
533533
uintptr_t const state = xfer->user_data;
534534
uint8_t const itf_num = (uint8_t) tu_le16toh(xfer->setup->wIndex);
535535
uint8_t const idx = tuh_cdc_itf_get_index(xfer->daddr, itf_num);
536-
TU_ASSERT(idx != TU_INDEX_INVALID_8, );
536+
TU_ASSERT(idx != TUSB_INDEX_INVALID_8, );
537537

538538
switch(state)
539539
{

src/class/cdc/cdc_host.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ typedef struct
8080
} tuh_cdc_itf_info_t;
8181

8282
// Get Interface index from device address + interface number
83-
// return TUSB_INDEX_INVALID (0xFF) if not found
83+
// return TUSB_INDEX_INVALID_8 (0xFF) if not found
8484
uint8_t tuh_cdc_itf_get_index(uint8_t daddr, uint8_t itf_num);
8585

8686
// Get Interface information

src/common/tusb_common.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@
7575

7676
#include "tusb_timeout.h" // TODO remove
7777

78-
enum
79-
{
80-
TU_INDEX_INVALID_8 = 0xFFu
81-
};
82-
83-
8478
//--------------------------------------------------------------------+
8579
// Optional API implemented by application if needed
8680
// TODO move to a more ovious place/file

src/common/tusb_types.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,11 @@ enum
273273
CONTROL_STAGE_ACK
274274
};
275275

276+
enum
277+
{
278+
TUSB_INDEX_INVALID_8 = 0xFFu
279+
};
280+
276281
//--------------------------------------------------------------------+
277282
// USB Descriptors
278283
//--------------------------------------------------------------------+

src/host/usbh.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ enum { CONFIG_NUM = 1 }; // default to use configuration 1
195195
// sum of end device + hub
196196
#define TOTAL_DEVICES (CFG_TUH_DEVICE_MAX + CFG_TUH_HUB)
197197

198-
static uint8_t _usbh_controller = TU_INDEX_INVALID_8;
198+
static uint8_t _usbh_controller = TUSB_INDEX_INVALID_8;
199199

200200
// Device with address = 0 for enumeration
201201
static usbh_dev0_t _dev0;
@@ -303,13 +303,13 @@ tusb_speed_t tuh_speed_get (uint8_t dev_addr)
303303
static void clear_device(usbh_device_t* dev)
304304
{
305305
tu_memclr(dev, sizeof(usbh_device_t));
306-
memset(dev->itf2drv, TU_INDEX_INVALID_8, sizeof(dev->itf2drv)); // invalid mapping
307-
memset(dev->ep2drv , TU_INDEX_INVALID_8, sizeof(dev->ep2drv )); // invalid mapping
306+
memset(dev->itf2drv, TUSB_INDEX_INVALID_8, sizeof(dev->itf2drv)); // invalid mapping
307+
memset(dev->ep2drv , TUSB_INDEX_INVALID_8, sizeof(dev->ep2drv )); // invalid mapping
308308
}
309309

310310
bool tuh_inited(void)
311311
{
312-
return _usbh_controller != TU_INDEX_INVALID_8;
312+
return _usbh_controller != TUSB_INDEX_INVALID_8;
313313
}
314314

315315
bool tuh_init(uint8_t controller_id)
@@ -1390,11 +1390,11 @@ static void process_enumeration(tuh_xfer_t* xfer)
13901390

13911391
dev->configured = 1;
13921392

1393-
// Start the Set Configuration process for interfaces (itf = TU_INDEX_INVALID_8)
1393+
// Start the Set Configuration process for interfaces (itf = TUSB_INDEX_INVALID_8)
13941394
// Since driver can perform control transfer within its set_config, this is done asynchronously.
13951395
// The process continue with next interface when class driver complete its sequence with usbh_driver_set_config_complete()
1396-
// TODO use separated API instead of using TU_INDEX_INVALID_8
1397-
usbh_driver_set_config_complete(daddr, TU_INDEX_INVALID_8);
1396+
// TODO use separated API instead of using TUSB_INDEX_INVALID_8
1397+
usbh_driver_set_config_complete(daddr, TUSB_INDEX_INVALID_8);
13981398
}
13991399
break;
14001400

@@ -1594,7 +1594,7 @@ static bool _parse_configuration_descriptor(uint8_t dev_addr, tusb_desc_configur
15941594
uint8_t const itf_num = desc_itf->bInterfaceNumber+i;
15951595

15961596
// Interface number must not be used already
1597-
TU_ASSERT( TU_INDEX_INVALID_8 == dev->itf2drv[itf_num] );
1597+
TU_ASSERT( TUSB_INDEX_INVALID_8 == dev->itf2drv[itf_num] );
15981598
dev->itf2drv[itf_num] = drv_id;
15991599
}
16001600

@@ -1628,7 +1628,7 @@ void usbh_driver_set_config_complete(uint8_t dev_addr, uint8_t itf_num)
16281628
// IAD binding interface such as CDCs should return itf_num + 1 when complete
16291629
// with usbh_driver_set_config_complete()
16301630
uint8_t const drv_id = dev->itf2drv[itf_num];
1631-
if (drv_id != TU_INDEX_INVALID_8)
1631+
if (drv_id != TUSB_INDEX_INVALID_8)
16321632
{
16331633
usbh_class_driver_t const * driver = &usbh_class_drivers[drv_id];
16341634
TU_LOG_USBH("%s set config: itf = %u\r\n", driver->name, itf_num);

0 commit comments

Comments
 (0)