Skip to content

Commit f50715c

Browse files
hathachhathach
committed
renaming usb class
1 parent 2958ad0 commit f50715c

File tree

9 files changed

+38
-40
lines changed

9 files changed

+38
-40
lines changed

‎cores/nRF5/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ int main( void )
7575
initVariant();
7676

7777
#ifdef NRF52840_XXAA
78-
USBDevice.addInterface( (Adafruit_USBDev_Interface&) Serial);
78+
USBDevice.addInterface( (Adafruit_USBD_Interface&) Serial);
7979
USBDevice.begin(USB_VID, USB_PID);
8080
usb_init();
8181
#endif

‎cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDev_CDC.cpp

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
#define EPOUT 0x00
3232
#define EPIN 0x80
3333

34-
Adafruit_USBDev_CDC Serial;
34+
Adafruit_USBD_CDC Serial;
3535

36-
Adafruit_USBDev_CDC::Adafruit_USBDev_CDC(void)
36+
Adafruit_USBD_CDC::Adafruit_USBD_CDC(void)
3737
{
3838

3939
}
4040

41-
uint16_t Adafruit_USBDev_CDC::getDescriptor(uint8_t* buf, uint16_t bufsize)
41+
uint16_t Adafruit_USBD_CDC::getDescriptor(uint8_t* buf, uint16_t bufsize)
4242
{
4343
// CDC is mostly always existed for DFU
4444
uint8_t desc[] = { TUD_CDC_DESCRIPTOR(0, 0, EPIN, 8, EPOUT, EPIN, 64) };
@@ -51,54 +51,54 @@ uint16_t Adafruit_USBDev_CDC::getDescriptor(uint8_t* buf, uint16_t bufsize)
5151
}
5252

5353
// Baud and config is ignore in CDC
54-
void Adafruit_USBDev_CDC::begin (uint32_t baud)
54+
void Adafruit_USBD_CDC::begin (uint32_t baud)
5555
{
5656
}
57-
void Adafruit_USBDev_CDC::begin (uint32_t baud, uint8_t config)
57+
void Adafruit_USBD_CDC::begin (uint32_t baud, uint8_t config)
5858
{
5959
}
6060

61-
void Adafruit_USBDev_CDC::end(void)
61+
void Adafruit_USBD_CDC::end(void)
6262
{
6363
// nothing to do
6464
}
6565

66-
Adafruit_USBDev_CDC::operator bool()
66+
Adafruit_USBD_CDC::operator bool()
6767
{
6868
return tud_cdc_connected();
6969
}
7070

71-
int Adafruit_USBDev_CDC::available(void)
71+
int Adafruit_USBD_CDC::available(void)
7272
{
7373
return tud_cdc_available();
7474
}
7575

76-
int Adafruit_USBDev_CDC::peek(void)
76+
int Adafruit_USBD_CDC::peek(void)
7777
{
7878
return tud_cdc_peek(0);
7979
}
8080

81-
int Adafruit_USBDev_CDC::read(void)
81+
int Adafruit_USBD_CDC::read(void)
8282
{
8383
return (int) tud_cdc_read_char();
8484
}
8585

86-
size_t Adafruit_USBDev_CDC::readBytes(char *buffer, size_t length)
86+
size_t Adafruit_USBD_CDC::readBytes(char *buffer, size_t length)
8787
{
8888
return tud_cdc_read(buffer, length);
8989
}
9090

91-
void Adafruit_USBDev_CDC::flush(void)
91+
void Adafruit_USBD_CDC::flush(void)
9292
{
9393
tud_cdc_write_flush();
9494
}
9595

96-
size_t Adafruit_USBDev_CDC::write(uint8_t ch)
96+
size_t Adafruit_USBD_CDC::write(uint8_t ch)
9797
{
9898
return tud_cdc_write_char((char) ch);
9999
}
100100

101-
size_t Adafruit_USBDev_CDC::write(const uint8_t *buffer, size_t size)
101+
size_t Adafruit_USBD_CDC::write(const uint8_t *buffer, size_t size)
102102
{
103103
size_t remain = size;
104104
while ( remain && tud_cdc_connected() )

‎cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDev_CDC.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
#include "Adafruit_USBDevice.h"
2929
#include "Stream.h"
3030

31-
class Adafruit_USBDev_CDC : public Stream, Adafruit_USBDev_Interface
31+
class Adafruit_USBD_CDC : public Stream, Adafruit_USBD_Interface
3232
{
3333
public:
34-
Adafruit_USBDev_CDC(void);
34+
Adafruit_USBD_CDC(void);
3535

3636
// fron Adafruit_USBInterface
3737
virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize);
@@ -56,6 +56,6 @@ class Adafruit_USBDev_CDC : public Stream, Adafruit_USBDev_Interface
5656
size_t readBytes(uint8_t *buffer, size_t length) { return readBytes((char *)buffer, length); }
5757
};
5858

59-
extern Adafruit_USBDev_CDC Serial;
59+
extern Adafruit_USBD_CDC Serial;
6060

6161
#endif /* ADAFRUIT_USBDEV_CDC_H_ */

‎cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDevice.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ tud_desc_set_t tud_desc_set =
6666

6767
} // extern C
6868

69-
Adafruit_USBDevice USBDevice;
69+
Adafruit_TinyUSB_Device USBDevice;
7070

71-
Adafruit_USBDevice::Adafruit_USBDevice(void)
71+
Adafruit_TinyUSB_Device::Adafruit_TinyUSB_Device(void)
7272
{
7373
tusb_desc_device_t desc_dev =
7474
{
@@ -131,7 +131,7 @@ Adafruit_USBDevice::Adafruit_USBDevice(void)
131131
// Add interface descriptor
132132
// - Interface number will be updated to match current count
133133
// - Endpoint number is updated to be unique
134-
bool Adafruit_USBDevice::addInterface(Adafruit_USBDev_Interface& itf)
134+
bool Adafruit_TinyUSB_Device::addInterface(Adafruit_USBD_Interface& itf)
135135
{
136136
uint8_t* desc = _desc_cfg+_desc_cfglen;
137137
uint16_t len = itf.getDescriptor(desc, sizeof(_desc_cfg)-_desc_cfglen);
@@ -173,7 +173,7 @@ bool Adafruit_USBDevice::addInterface(Adafruit_USBDev_Interface& itf)
173173
return true;
174174
}
175175

176-
bool Adafruit_USBDevice::begin(uint16_t vid, uint16_t pid)
176+
bool Adafruit_TinyUSB_Device::begin(uint16_t vid, uint16_t pid)
177177
{
178178
_desc_device.idVendor = vid;
179179
_desc_device.idProduct = pid;

‎cores/nRF5/usb/Adafruit_TinyUSB_core/Adafruit_USBDevice.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727

2828
#include "tusb.h"
2929

30-
class Adafruit_USBDev_Interface
30+
class Adafruit_USBD_Interface
3131
{
3232
public:
3333
virtual uint16_t getDescriptor(uint8_t* buf, uint16_t bufsize) = 0;
3434
};
3535

36-
class Adafruit_USBDevice
36+
class Adafruit_TinyUSB_Device
3737
{
3838
private:
3939
tusb_desc_device_t _desc_device;
@@ -47,13 +47,13 @@ class Adafruit_USBDevice
4747
uint8_t _epout_count;
4848

4949
public:
50-
Adafruit_USBDevice(void);
50+
Adafruit_TinyUSB_Device(void);
5151

52-
bool addInterface(Adafruit_USBDev_Interface& itf);
52+
bool addInterface(Adafruit_USBD_Interface& itf);
5353

5454
bool begin(uint16_t vid, uint16_t pid);
5555
};
5656

57-
extern Adafruit_USBDevice USBDevice;
57+
extern Adafruit_TinyUSB_Device USBDevice;
5858

5959
#endif /* ADAFRUIT_USBDEVICE_H_ */

‎libraries/Adafruit_TinyUSB_Arduino/src/Adafruit_TinyUSB.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@
2525
#ifndef ADAFRUIT_TINYUSB_H_
2626
#define ADAFRUIT_TINYUSB_H_
2727

28-
#include "tusb.h"
29-
#include "Adafruit_USBDevice.h"
3028
#include "Adafruit_USBDev_MSC.h"
3129

3230
#endif /* ADAFRUIT_TINYUSB_H_ */

‎libraries/Adafruit_TinyUSB_Arduino/src/Adafruit_USBDev_MSC.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,15 @@
2828
#define EPIN 0x80
2929
#define EPSIZE 64 // TODO must be 512 for highspeed device
3030

31-
static Adafruit_USBDev_MSC* _msc_dev = NULL;
31+
static Adafruit_USBD_MSC* _msc_dev = NULL;
3232

33-
Adafruit_USBDev_MSC::Adafruit_USBDev_MSC(void)
33+
Adafruit_USBD_MSC::Adafruit_USBD_MSC(void)
3434
{
3535
_block_count = 0;
3636
_block_size = 0;
3737
}
3838

39-
uint16_t Adafruit_USBDev_MSC::getDescriptor(uint8_t* buf, uint16_t bufsize)
39+
uint16_t Adafruit_USBD_MSC::getDescriptor(uint8_t* buf, uint16_t bufsize)
4040
{
4141
uint8_t desc[] = { TUD_MSC_DESCRIPTOR(0, 0, EPOUT, EPIN, EPSIZE) };
4242
uint16_t const len = sizeof(desc);
@@ -46,26 +46,26 @@ uint16_t Adafruit_USBDev_MSC::getDescriptor(uint8_t* buf, uint16_t bufsize)
4646
return len;
4747
}
4848

49-
void Adafruit_USBDev_MSC::setCapacity(uint32_t block_count, uint16_t block_size)
49+
void Adafruit_USBD_MSC::setCapacity(uint32_t block_count, uint16_t block_size)
5050
{
5151
_block_count = block_count;
5252
_block_size = block_size;
5353
}
5454

55-
void Adafruit_USBDev_MSC::getCapacity(uint32_t* block_count, uint16_t* block_size)
55+
void Adafruit_USBD_MSC::getCapacity(uint32_t* block_count, uint16_t* block_size)
5656
{
5757
(*block_count) = _block_count;
5858
(*block_size) = _block_size;
5959
}
6060

61-
void Adafruit_USBDev_MSC::setCallback(read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb)
61+
void Adafruit_USBD_MSC::setCallback(read_callback_t rd_cb, write_callback_t wr_cb, flush_callback_t fl_cb)
6262
{
6363
_rd_cb = rd_cb;
6464
_wr_cb = wr_cb;
6565
_fl_cb = fl_cb;
6666
}
6767

68-
bool Adafruit_USBDev_MSC::begin(void)
68+
bool Adafruit_USBD_MSC::begin(void)
6969
{
7070
if ( !USBDevice.addInterface(*this) ) return false;
7171

‎libraries/Adafruit_TinyUSB_Arduino/src/Adafruit_USBDev_MSC.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@
2525
#ifndef ADAFRUIT_USBDEV_MSC_H_
2626
#define ADAFRUIT_USBDEV_MSC_H_
2727

28-
#include "Adafruit_USBDevice.h"
28+
#include "Adafruit_TinyUSB_core.h"
2929

30-
class Adafruit_USBDev_MSC : Adafruit_USBDev_Interface
30+
class Adafruit_USBD_MSC : Adafruit_USBD_Interface
3131
{
3232
public:
3333
typedef int32_t (*read_callback_t ) (uint8_t lun, uint32_t lba, uint32_t offset, void* buffer, uint32_t bufsize);
3434
typedef int32_t (*write_callback_t) (uint8_t lun, uint32_t lba, uint32_t offset, uint8_t* buffer, uint32_t bufsize);
3535
typedef void (*flush_callback_t) (uint8_t lun);
3636

37-
Adafruit_USBDev_MSC(void);
37+
Adafruit_USBD_MSC(void);
3838

3939
bool begin(void);
4040

‎libraries/FileSystem/examples/External_ListFiles/External_ListFiles.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
*/
2525
#define MAX_LEVEL 2
2626

27-
Adafruit_USBDev_MSC usbmsc;
27+
Adafruit_USBD_MSC usbmsc;
2828

2929
// the setup function runs once when you press reset or power the board
3030
void setup()

0 commit comments

Comments
 (0)