ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Applied suggested astyle fixes

pull/9539/head
Russ Butler 2019-01-29 15:45:18 -06:00
parent 5867e99bc9
commit f8864ae307
11 changed files with 60 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
TESTS/usb_device/basic/USBTester.cpp
View File

@ -41,9 +41,9 @@
USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release): USBTester::USBTester(USBPhy *phy, uint16_t vendor_id, uint16_t product_id, uint16_t product_release):
USBDevice(phy, vendor_id, product_id, product_release), interface_0_alt_set(NONE), USBDevice(phy, vendor_id, product_id, product_release), interface_0_alt_set(NONE),
interface_1_alt_set(NONE), configuration_set(NONE), reset_count(0), interface_1_alt_set(NONE), configuration_set(NONE), reset_count(0),
suspend_count(0), resume_count(0) suspend_count(0), resume_count(0)
{ {
EndpointResolver resolver(endpoint_table()); EndpointResolver resolver(endpoint_table());
@ -269,14 +269,14 @@ bool USBTester::set_configuration(uint16_t configuration)
bulk_buf, sizeof(bulk_buf), &USBTester::epbulk_out_callback); bulk_buf, sizeof(bulk_buf), &USBTester::epbulk_out_callback);
// interface 1 alternate 0 // interface 1 alternate 0
success &= setup_iterface(int_in, int_out, MAX_EP_SIZE, USB_EP_TYPE_INT, success &= setup_iterface(int_in, int_out, MAX_EP_SIZE, USB_EP_TYPE_INT,
int_buf, sizeof(int_buf), &USBTester::epint_out_callback); int_buf, sizeof(int_buf), &USBTester::epint_out_callback);
} else if (configuration == 2) { } else if (configuration == 2) {
// interface 0 alternate 0 // interface 0 alternate 0
success = setup_iterface(int_in, int_out, MIN_EP_SIZE, USB_EP_TYPE_INT, success = setup_iterface(int_in, int_out, MIN_EP_SIZE, USB_EP_TYPE_INT,
int_buf, sizeof(int_buf), &USBTester::epint_out_callback); int_buf, sizeof(int_buf), &USBTester::epint_out_callback);
// interface 1 alternate 0 // interface 1 alternate 0
success &= setup_iterface(bulk_in, bulk_out, MIN_EP_SIZE, USB_EP_TYPE_BULK, success &= setup_iterface(bulk_in, bulk_out, MIN_EP_SIZE, USB_EP_TYPE_BULK,
bulk_buf, sizeof(bulk_buf), &USBTester::epbulk_out_callback); bulk_buf, sizeof(bulk_buf), &USBTester::epbulk_out_callback);
} }
if (success) { if (success) {
configuration_set = configuration; configuration_set = configuration;

30
TESTS/usb_device/basic/USBTester.h
View File

@ -47,12 +47,30 @@ public:
const char *get_serial_desc_string(); const char *get_serial_desc_string();
const char *get_iproduct_desc_string(); const char *get_iproduct_desc_string();
const char *get_iinterface_desc_string(); const char *get_iinterface_desc_string();
uint32_t get_reset_count() const { return reset_count; } uint32_t get_reset_count() const
uint32_t get_suspend_count() const { return suspend_count; } {
uint32_t get_resume_count() const { return resume_count; } return reset_count;
void clear_reset_count() { reset_count = 0; } }
void clear_suspend_count() { suspend_count = 0; } uint32_t get_suspend_count() const
void clear_resume_count() { resume_count = 0; } {
return suspend_count;
}
uint32_t get_resume_count() const
{
return resume_count;
}
void clear_reset_count()
{
reset_count = 0;
}
void clear_suspend_count()
{
suspend_count = 0;
}
void clear_resume_count()
{
resume_count = 0;
}
private: private:

4
usb/device/USBAudio/USBAudio.cpp
View File

@ -498,7 +498,7 @@ void USBAudio::callback_request_xfer_done(const setup_packet_t *setup, bool abor
} }
if ((setup->wLength == 1) || (setup->wLength == 2)) { if ((setup->wLength == 1) || (setup->wLength == 2)) {
uint16_t data = (_control_receive[0] << 0) | (_control_receive[1] << 8); uint16_t data = (_control_receive[0] << 0) | (_control_receive[1] << 8);
data &= ((setup->wLength == 1) ? 0xFF : 0xFFFF); data &= ((setup->wLength == 1) ? 0xFF : 0xFFFF);
switch (setup->wValue >> 8) { switch (setup->wValue >> 8) {
case MUTE_CONTROL: case MUTE_CONTROL:
@ -516,7 +516,7 @@ void USBAudio::callback_request_xfer_done(const setup_packet_t *setup, bool abor
case REQUEST_SET_CUR: case REQUEST_SET_CUR:
_vol_cur = data; _vol_cur = data;
_volume = (float)_vol_cur / (float)_vol_max; _volume = (float)_vol_cur / (float)_vol_max;
_update_vol.call(); _update_vol.call();
break; break;
default: default:
break; break;

6
usb/device/USBAudio/USBAudio.h
View File

@ -80,7 +80,7 @@ public:
* @param product_id Your product_id * @param product_id Your product_id
* @param product_release Your product_release * @param product_release Your product_release
*/ */
USBAudio(bool connect=true, uint32_t frequency_rx = 48000, uint8_t channel_count_rx = 1, uint32_t frequency_tx = 8000, uint8_t channel_count_tx = 1, uint32_t buffer_ms=10, uint16_t vendor_id = 0x7bb8, uint16_t product_id = 0x1111, uint16_t product_release = 0x0100); USBAudio(bool connect = true, uint32_t frequency_rx = 48000, uint8_t channel_count_rx = 1, uint32_t frequency_tx = 8000, uint8_t channel_count_tx = 1, uint32_t buffer_ms = 10, uint16_t vendor_id = 0x7bb8, uint16_t product_id = 0x1111, uint16_t product_release = 0x0100);
/** /**
* Fully featured constructor * Fully featured constructor
@ -153,7 +153,7 @@ public:
* @param clear Reset the overflow count back to 0 * @param clear Reset the overflow count back to 0
* @return Number of packets dropped due to overflow * @return Number of packets dropped due to overflow
*/ */
uint32_t read_overflows(bool clear=false); uint32_t read_overflows(bool clear = false);
/** /**
* Check if the audio read channel is open * Check if the audio read channel is open
@ -196,7 +196,7 @@ public:
* @return Number of packets that should have been * @return Number of packets that should have been
* sent but weren't due to overflow * sent but weren't due to overflow
*/ */
uint32_t write_underflows(bool clear=false); uint32_t write_underflows(bool clear = false);
/** /**
* Check if the audio write channel is open * Check if the audio write channel is open

3
usb/device/USBDevice/EndpointResolver.cpp
View File

@ -73,7 +73,8 @@ bool EndpointResolver::valid()
return _valid && (_cost <= _table->resources); return _valid && (_cost <= _table->resources);
} }
void EndpointResolver::reset() { void EndpointResolver::reset()
{
_cost = 0; _cost = 0;
_used = 0; _used = 0;
_valid = true; _valid = true;

25
usb/device/USBDevice/USBDevice.cpp
View File

@ -64,8 +64,7 @@ bool USBDevice::_request_get_descriptor()
printf("get descr: type: %d\r\n", DESCRIPTOR_TYPE(_transfer.setup.wValue)); printf("get descr: type: %d\r\n", DESCRIPTOR_TYPE(_transfer.setup.wValue));
#endif #endif
switch (DESCRIPTOR_TYPE(_transfer.setup.wValue)) { switch (DESCRIPTOR_TYPE(_transfer.setup.wValue)) {
case DEVICE_DESCRIPTOR: case DEVICE_DESCRIPTOR: {
{
if (device_desc() != NULL) { if (device_desc() != NULL) {
if ((device_desc()[0] == DEVICE_DESCRIPTOR_LENGTH) \ if ((device_desc()[0] == DEVICE_DESCRIPTOR_LENGTH) \
&& (device_desc()[1] == DEVICE_DESCRIPTOR)) { && (device_desc()[1] == DEVICE_DESCRIPTOR)) {
@ -80,8 +79,7 @@ bool USBDevice::_request_get_descriptor()
} }
break; break;
} }
case CONFIGURATION_DESCRIPTOR: case CONFIGURATION_DESCRIPTOR: {
{
const uint8_t idx = DESCRIPTOR_INDEX(_transfer.setup.wValue); const uint8_t idx = DESCRIPTOR_INDEX(_transfer.setup.wValue);
if (configuration_desc(idx) != NULL) { if (configuration_desc(idx) != NULL) {
if ((configuration_desc(idx)[0] == CONFIGURATION_DESCRIPTOR_LENGTH) \ if ((configuration_desc(idx)[0] == CONFIGURATION_DESCRIPTOR_LENGTH) \
@ -91,7 +89,7 @@ bool USBDevice::_request_get_descriptor()
#endif #endif
/* Get wTotalLength */ /* Get wTotalLength */
_transfer.remaining = configuration_desc(idx)[2] \ _transfer.remaining = configuration_desc(idx)[2] \
| (configuration_desc(idx)[3] << 8); | (configuration_desc(idx)[3] << 8);
_transfer.ptr = (uint8_t *)configuration_desc(idx); _transfer.ptr = (uint8_t *)configuration_desc(idx);
_transfer.direction = Send; _transfer.direction = Send;
@ -100,8 +98,7 @@ bool USBDevice::_request_get_descriptor()
} }
break; break;
} }
case STRING_DESCRIPTOR: case STRING_DESCRIPTOR: {
{
#ifdef DEBUG #ifdef DEBUG
printf("str descriptor\r\n"); printf("str descriptor\r\n");
#endif #endif
@ -163,23 +160,20 @@ bool USBDevice::_request_get_descriptor()
} }
break; break;
} }
case INTERFACE_DESCRIPTOR: case INTERFACE_DESCRIPTOR: {
{
#ifdef DEBUG #ifdef DEBUG
printf("interface descr\r\n"); printf("interface descr\r\n");
#endif #endif
break; break;
} }
case ENDPOINT_DESCRIPTOR: case ENDPOINT_DESCRIPTOR: {
{
#ifdef DEBUG #ifdef DEBUG
printf("endpoint descr\r\n"); printf("endpoint descr\r\n");
#endif #endif
/* TODO: Support is optional, not implemented here */ /* TODO: Support is optional, not implemented here */
break; break;
} }
default: default: {
{
#ifdef DEBUG #ifdef DEBUG
printf("ERROR\r\n"); printf("ERROR\r\n");
#endif #endif
@ -1154,7 +1148,7 @@ void USBDevice::endpoint_stall(usb_ep_t endpoint)
_phy->endpoint_stall(endpoint); _phy->endpoint_stall(endpoint);
if (info->pending) { if (info->pending) {
endpoint_abort(endpoint); endpoint_abort(endpoint);
} }
unlock(); unlock();
@ -1589,7 +1583,8 @@ void USBDevice::assert_locked()
MBED_ASSERT(_locked > 0); MBED_ASSERT(_locked > 0);
} }
void USBDevice::_change_state(DeviceState new_state) { void USBDevice::_change_state(DeviceState new_state)
{
assert_locked(); assert_locked();
DeviceState old_state = _device.state; DeviceState old_state = _device.state;

2
usb/device/USBDevice/USBDevice.h
View File

@ -403,7 +403,7 @@ protected:
* @param data Buffer to send or receive if the result is Send or Receive * @param data Buffer to send or receive if the result is Send or Receive
* @param size Size to transfer if the result is Send or Receive * @param size Size to transfer if the result is Send or Receive
*/ */
void complete_request(RequestResult result, uint8_t *data=NULL, uint32_t size=0); void complete_request(RequestResult result, uint8_t *data = NULL, uint32_t size = 0);
/** /**
* Called by USBDevice on data stage completion * Called by USBDevice on data stage completion

9
usb/device/USBHID/USBMouseKeyboard.h
View File

@ -68,8 +68,7 @@
* *
* @note Synchronization level: Thread safe * @note Synchronization level: Thread safe
*/ */
class USBMouseKeyboard: public USBHID, public mbed::Stream class USBMouseKeyboard: public USBHID, public mbed::Stream {
{
public: public:
/** /**
@ -86,7 +85,7 @@ public:
* @param product_release Your preoduct_release (default: 0x0001) * @param product_release Your preoduct_release (default: 0x0001)
* *
*/ */
USBMouseKeyboard(bool connect_blocking=true, MOUSE_TYPE mouse_type=REL_MOUSE, uint16_t vendor_id=0x0021, uint16_t product_id=0x0011, uint16_t product_release=0x0001); USBMouseKeyboard(bool connect_blocking = true, MOUSE_TYPE mouse_type = REL_MOUSE, uint16_t vendor_id = 0x0021, uint16_t product_id = 0x0011, uint16_t product_release = 0x0001);
/** /**
* Fully featured constructor * Fully featured constructor
@ -106,7 +105,7 @@ public:
* @param product_release Your preoduct_release (default: 0x0001) * @param product_release Your preoduct_release (default: 0x0001)
* *
*/ */
USBMouseKeyboard(USBPhy *phy, MOUSE_TYPE mouse_type=REL_MOUSE, uint16_t vendor_id=0x0021, uint16_t product_id=0x0011, uint16_t product_release=0x0001); USBMouseKeyboard(USBPhy *phy, MOUSE_TYPE mouse_type = REL_MOUSE, uint16_t vendor_id = 0x0021, uint16_t product_id = 0x0011, uint16_t product_release = 0x0001);
/** /**
* Destroy this object * Destroy this object
@ -221,7 +220,7 @@ public:
* *
* @returns pointer to the report descriptor * @returns pointer to the report descriptor
*/ */
virtual const uint8_t * report_desc(); virtual const uint8_t *report_desc();
/* /*
* Called when a data is received on the OUT endpoint. Useful to switch on LED of LOCK keys * Called when a data is received on the OUT endpoint. Useful to switch on LED of LOCK keys

6
usb/device/USBMSD/USBMSD.cpp
View File

@ -212,14 +212,14 @@ void USBMSD::attach(mbed::Callback<void()> cb)
unlock(); unlock();
} }
int USBMSD::disk_read(uint8_t* data, uint64_t block, uint8_t count) int USBMSD::disk_read(uint8_t *data, uint64_t block, uint8_t count)
{ {
bd_addr_t addr = block * _bd->get_erase_size(); bd_addr_t addr = block * _bd->get_erase_size();
bd_size_t size = count * _bd->get_erase_size(); bd_size_t size = count * _bd->get_erase_size();
return _bd->read(data, addr, size); return _bd->read(data, addr, size);
} }
int USBMSD::disk_write(const uint8_t* data, uint64_t block, uint8_t count) int USBMSD::disk_write(const uint8_t *data, uint64_t block, uint8_t count)
{ {
bd_addr_t addr = block * _bd->get_erase_size(); bd_addr_t addr = block * _bd->get_erase_size();
bd_size_t size = count * _bd->get_erase_size(); bd_size_t size = count * _bd->get_erase_size();
@ -434,7 +434,7 @@ void USBMSD::_control(const setup_packet_t *setup)
break; break;
case MSC_REQUEST_GET_MAX_LUN: case MSC_REQUEST_GET_MAX_LUN:
result = Send; result = Send;
data = (uint8_t*)maxLUN; data = (uint8_t *)maxLUN;
size = 1; size = 1;
break; break;
default: default:

6
usb/device/USBMSD/USBMSD.h
View File

@ -181,7 +181,8 @@ private:
}; };
// Bulk-only CBW // Bulk-only CBW
typedef MBED_PACKED(struct) { typedef MBED_PACKED(struct)
{
uint32_t Signature; uint32_t Signature;
uint32_t Tag; uint32_t Tag;
uint32_t DataLength; uint32_t DataLength;
@ -192,7 +193,8 @@ private:
} CBW; } CBW;
// Bulk-only CSW // Bulk-only CSW
typedef MBED_PACKED(struct) { typedef MBED_PACKED(struct)
{
uint32_t Signature; uint32_t Signature;
uint32_t Tag; uint32_t Tag;
uint32_t DataResidue; uint32_t DataResidue;

4
usb/device/USBSerial/USBSerial.h
View File

@ -57,7 +57,7 @@ public:
* @param product_release Your product_release (default: 0x0001) * @param product_release Your product_release (default: 0x0001)
* *
*/ */
USBSerial(bool connect_blocking=true, uint16_t vendor_id=0x1f00, uint16_t product_id=0x2012, uint16_t product_release=0x0001); USBSerial(bool connect_blocking = true, uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001);
/** /**
* Fully featured constructor * Fully featured constructor
@ -76,7 +76,7 @@ public:
* @param product_release Your product_release (default: 0x0001) * @param product_release Your product_release (default: 0x0001)
* *
*/ */
USBSerial(USBPhy *phy, uint16_t vendor_id=0x1f00, uint16_t product_id=0x2012, uint16_t product_release=0x0001); USBSerial(USBPhy *phy, uint16_t vendor_id = 0x1f00, uint16_t product_id = 0x2012, uint16_t product_release = 0x0001);
/** /**
* Destroy this object * Destroy this object