andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename port to rhport for clarification

Browse Source
This commit is contained in:
hathach
2018-03-23 12:17:47 +07:00
parent 98d6ec1ef5
commit 6d50d05d95
31 changed files with 380 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/obsolete/device/src/cdc_device_app.c
View File

@@ -59,16 +59,16 @@ enum { SERIAL_BUFFER_SIZE = 64 };
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void cdc_serial_app_mount(uint8_t port)
void cdc_serial_app_mount(uint8_t rhport)
{
}
void cdc_serial_app_umount(uint8_t port)
void cdc_serial_app_umount(uint8_t rhport)
{
}
void tud_cdc_rx_cb(uint8_t port)
void tud_cdc_rx_cb(uint8_t rhport)
{
}

4
examples/obsolete/device/src/cdc_device_app.h
View File

@@ -58,8 +58,8 @@
void cdc_serial_app_init(void);
void cdc_serial_app_task(void* param);
void cdc_serial_app_mount(uint8_t port);
void cdc_serial_app_umount(uint8_t port);
void cdc_serial_app_mount(uint8_t rhport);
void cdc_serial_app_umount(uint8_t rhport);
#else

10
examples/obsolete/device/src/keyboard_device_app.c
View File

@@ -56,17 +56,17 @@ TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report;
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void keyboard_app_mount(uint8_t port)
void keyboard_app_mount(uint8_t rhport)
{
}
void keyboard_app_umount(uint8_t port)
void keyboard_app_umount(uint8_t rhport)
{
}
void tud_hid_keyboard_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes)
void tud_hid_keyboard_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes)
{
switch(event)
{
@@ -77,7 +77,7 @@ void tud_hid_keyboard_cb(uint8_t port, tusb_event_t event, uint32_t xferred_byte
}
}
uint16_t tud_hid_keyboard_get_report_cb(uint8_t port, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length)
uint16_t tud_hid_keyboard_get_report_cb(uint8_t rhport, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length)
{
// get other than input report is not supported by this keyboard demo
if ( report_type != HID_REQUEST_REPORT_INPUT ) return 0;
@@ -86,7 +86,7 @@ uint16_t tud_hid_keyboard_get_report_cb(uint8_t port, hid_request_report_type_t
return requested_length;
}
void tud_hid_keyboard_set_report_cb(uint8_t port, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length)
void tud_hid_keyboard_set_report_cb(uint8_t rhport, hid_request_report_type_t report_type, uint8_t p_report_data[], uint16_t length)
{
// set other than output report is not supported by this keyboard demo
if ( report_type != HID_REQUEST_REPORT_OUTPUT ) return;

4
examples/obsolete/device/src/keyboard_device_app.h
View File

@@ -58,8 +58,8 @@
void keyboard_app_init(void);
void keyboard_app_task(void* param);
void keyboard_app_mount(uint8_t port);
void keyboard_app_umount(uint8_t port);
void keyboard_app_mount(uint8_t rhport);
void keyboard_app_umount(uint8_t rhport);
#else

16
examples/obsolete/device/src/main.c
View File

@@ -111,18 +111,18 @@ int main(void)
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void tud_mount_cb(uint8_t port)
void tud_mount_cb(uint8_t rhport)
{
cdc_serial_app_mount(port);
keyboard_app_mount(port);
msc_app_mount(port);
cdc_serial_app_mount(rhport);
keyboard_app_mount(rhport);
msc_app_mount(rhport);
}
void tud_umount_cb(uint8_t port)
void tud_umount_cb(uint8_t rhport)
{
cdc_serial_app_umount(port);
keyboard_app_umount(port);
msc_app_umount(port);
cdc_serial_app_umount(rhport);
keyboard_app_umount(rhport);
msc_app_umount(rhport);
}
//--------------------------------------------------------------------+

10
examples/obsolete/device/src/mouse_device_app.c
View File

@@ -56,17 +56,17 @@ TUSB_CFG_ATTR_USBRAM hid_mouse_report_t mouse_report;
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void mouse_app_mount(uint8_t port)
void mouse_app_mount(uint8_t rhport)
{
}
void mouse_app_umount(uint8_t port)
void mouse_app_umount(uint8_t rhport)
{
}
void tud_hid_mouse_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes)
void tud_hid_mouse_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes)
{
switch(event)
{
@@ -77,7 +77,7 @@ void tud_hid_mouse_cb(uint8_t port, tusb_event_t event, uint32_t xferred_bytes)
}
}
uint16_t tud_hid_mouse_get_report_cb(uint8_t port, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length)
uint16_t tud_hid_mouse_get_report_cb(uint8_t rhport, hid_request_report_type_t report_type, void** pp_report, uint16_t requested_length)
{
if ( report_type != HID_REQUEST_REPORT_INPUT ) return 0; // not support other report type for this mouse demo
@@ -85,7 +85,7 @@ uint16_t tud_hid_mouse_get_report_cb(uint8_t port, hid_request_report_type_t rep
return requested_length;
}
void tud_hid_mouse_set_report_cb(uint8_t port, hid_request_report_type_t report_type, uint8_t report_data[], uint16_t length)
void tud_hid_mouse_set_report_cb(uint8_t rhport, hid_request_report_type_t report_type, uint8_t report_data[], uint16_t length)
{
// mouse demo does not support set report --> do nothing
}

4
examples/obsolete/device/src/mouse_device_app.h
View File

@@ -57,8 +57,8 @@
void mouse_app_init(void);
void mouse_app_task(void * param);
void mouse_app_mount(uint8_t port);
void mouse_app_umount(uint8_t port);
void mouse_app_mount(uint8_t rhport);
void mouse_app_umount(uint8_t rhport);
#else

6
examples/obsolete/device/src/msc_device_app.c
View File

@@ -89,17 +89,17 @@ static scsi_mode_parameters_t const msc_dev_mode_para =
//--------------------------------------------------------------------+
// tinyusb callbacks
//--------------------------------------------------------------------+
void msc_app_mount(uint8_t port)
void msc_app_mount(uint8_t rhport)
{
}
void msc_app_umount(uint8_t port)
void msc_app_umount(uint8_t rhport)
{
}
msc_csw_status_t tud_msc_scsi_cb (uint8_t port, uint8_t lun, uint8_t scsi_cmd[16], void const ** pp_buffer, uint16_t* p_length)
msc_csw_status_t tud_msc_scsi_cb (uint8_t rhport, uint8_t lun, uint8_t scsi_cmd[16], void const ** pp_buffer, uint16_t* p_length)
{
// read10 & write10 has their own callback and MUST not be handled here
switch (scsi_cmd[0])

4
examples/obsolete/device/src/msc_device_app.h
View File

@@ -72,8 +72,8 @@ issue at github.com/hathach/tinyusb"
void msc_app_init(void);
void msc_app_task(void* param);
void msc_app_mount(uint8_t port);
void msc_app_umount(uint8_t port);
void msc_app_mount(uint8_t rhport);
void msc_app_umount(uint8_t rhport);
extern scsi_sense_fixed_data_t mscd_sense_data;

4
examples/obsolete/device/src/msc_device_ramdisk.c
View File

@@ -91,13 +91,13 @@ uint8_t msc_device_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
//--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
uint16_t tud_msc_read10_cb (uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
{
(*pp_buffer) = msc_device_ramdisk[lba];
return min16_of(block_count, DISK_BLOCK_NUM);
}
uint16_t tud_msc_write10_cb(uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
uint16_t tud_msc_write10_cb(uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
{
(*pp_buffer) = msc_device_ramdisk[lba];

4
examples/obsolete/device/src/msc_device_romdisk.c
View File

@@ -97,7 +97,7 @@ static uint8_t sector_buffer[DISK_BLOCK_SIZE];
//--------------------------------------------------------------------+
// IMPLEMENTATION
//--------------------------------------------------------------------+
uint16_t tusbd_msc_read10_cb (uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
uint16_t tusbd_msc_read10_cb (uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
{
memcpy(sector_buffer, msc_device_app_rommdisk[lba], DISK_BLOCK_SIZE);
(*pp_buffer) = sector_buffer;
@@ -106,7 +106,7 @@ uint16_t tusbd_msc_read10_cb (uint8_t port, uint8_t lun, void** pp_buffer, uint3
}
// Stall write10 by return 0, as this is readonly disk
uint16_t tusbd_msc_write10_cb(uint8_t port, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
uint16_t tusbd_msc_write10_cb(uint8_t rhport, uint8_t lun, void** pp_buffer, uint32_t lba, uint16_t block_count)
{
(*pp_buffer) = NULL;