diff options
| author | hathach <[email protected]> | 2018-03-23 12:17:47 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-23 12:17:47 +0700 |
| commit | 6d50d05d9544a5f560242d3c8685413f814aaa76 (patch) | |
| tree | f5c133c831e673502c0bb86133fda3644b60ff56 /examples | |
| parent | 98d6ec1ef540b431c249dc5e01d3311c83c4cd54 (diff) | |
rename port to rhport for clarification
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/obsolete/device/src/cdc_device_app.c | 6 | ||||
| -rw-r--r-- | examples/obsolete/device/src/cdc_device_app.h | 4 | ||||
| -rw-r--r-- | examples/obsolete/device/src/keyboard_device_app.c | 10 | ||||
| -rw-r--r-- | examples/obsolete/device/src/keyboard_device_app.h | 4 | ||||
| -rw-r--r-- | examples/obsolete/device/src/main.c | 16 | ||||
| -rw-r--r-- | examples/obsolete/device/src/mouse_device_app.c | 10 | ||||
| -rw-r--r-- | examples/obsolete/device/src/mouse_device_app.h | 4 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_app.c | 6 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_app.h | 4 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_ramdisk.c | 4 | ||||
| -rw-r--r-- | examples/obsolete/device/src/msc_device_romdisk.c | 4 |
11 files changed, 36 insertions, 36 deletions
diff --git a/examples/obsolete/device/src/cdc_device_app.c b/examples/obsolete/device/src/cdc_device_app.c index 406ab2a4a..113ebae98 100644 --- a/examples/obsolete/device/src/cdc_device_app.c +++ b/examples/obsolete/device/src/cdc_device_app.c @@ -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) { } diff --git a/examples/obsolete/device/src/cdc_device_app.h b/examples/obsolete/device/src/cdc_device_app.h index 41c619864..a2cd70eb7 100644 --- a/examples/obsolete/device/src/cdc_device_app.h +++ b/examples/obsolete/device/src/cdc_device_app.h @@ -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 diff --git a/examples/obsolete/device/src/keyboard_device_app.c b/examples/obsolete/device/src/keyboard_device_app.c index e1001da96..64087053a 100644 --- a/examples/obsolete/device/src/keyboard_device_app.c +++ b/examples/obsolete/device/src/keyboard_device_app.c @@ -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; diff --git a/examples/obsolete/device/src/keyboard_device_app.h b/examples/obsolete/device/src/keyboard_device_app.h index 576851a7a..4d069ae39 100644 --- a/examples/obsolete/device/src/keyboard_device_app.h +++ b/examples/obsolete/device/src/keyboard_device_app.h @@ -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 diff --git a/examples/obsolete/device/src/main.c b/examples/obsolete/device/src/main.c index 81f7a27d7..0cd9eb3bc 100644 --- a/examples/obsolete/device/src/main.c +++ b/examples/obsolete/device/src/main.c @@ -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); } //--------------------------------------------------------------------+ diff --git a/examples/obsolete/device/src/mouse_device_app.c b/examples/obsolete/device/src/mouse_device_app.c index 5212d10ce..b04ef7133 100644 --- a/examples/obsolete/device/src/mouse_device_app.c +++ b/examples/obsolete/device/src/mouse_device_app.c @@ -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 } diff --git a/examples/obsolete/device/src/mouse_device_app.h b/examples/obsolete/device/src/mouse_device_app.h index daf2bcb7f..f39f8e30f 100644 --- a/examples/obsolete/device/src/mouse_device_app.h +++ b/examples/obsolete/device/src/mouse_device_app.h @@ -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 diff --git a/examples/obsolete/device/src/msc_device_app.c b/examples/obsolete/device/src/msc_device_app.c index 906c1fa09..5650d8b71 100644 --- a/examples/obsolete/device/src/msc_device_app.c +++ b/examples/obsolete/device/src/msc_device_app.c @@ -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]) diff --git a/examples/obsolete/device/src/msc_device_app.h b/examples/obsolete/device/src/msc_device_app.h index b0ad440ba..cd087b8a3 100644 --- a/examples/obsolete/device/src/msc_device_app.h +++ b/examples/obsolete/device/src/msc_device_app.h @@ -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; diff --git a/examples/obsolete/device/src/msc_device_ramdisk.c b/examples/obsolete/device/src/msc_device_ramdisk.c index 3f9c89dfb..a8f73d8cf 100644 --- a/examples/obsolete/device/src/msc_device_ramdisk.c +++ b/examples/obsolete/device/src/msc_device_ramdisk.c @@ -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]; diff --git a/examples/obsolete/device/src/msc_device_romdisk.c b/examples/obsolete/device/src/msc_device_romdisk.c index 931e5d367..16c8fe518 100644 --- a/examples/obsolete/device/src/msc_device_romdisk.c +++ b/examples/obsolete/device/src/msc_device_romdisk.c @@ -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; |
