From bbcc7674653a6131ddba8f31d56bd78b366bb40d Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Fri, 9 Aug 2024 22:49:46 +0800 Subject: [PATCH] update(demo): change uint32_t to uintptr_t for 64bit cpu register --- demo/audio_v1_mic_multichan_template.c | 2 +- demo/audio_v1_mic_speaker_multichan_template.c | 2 +- demo/audio_v2_mic_multichan_template.c | 2 +- demo/audio_v2_mic_speaker_multichan_template.c | 2 +- demo/audio_v2_speaker_multichan_template.c | 2 +- demo/bootuf2/msc_bootuf2_template.c | 2 +- demo/cdc_acm_hid_msc_template.c | 2 +- demo/cdc_acm_msc_template.c | 2 +- demo/cdc_acm_multi_template.c | 2 +- demo/cdc_acm_template.c | 2 +- demo/cdc_ecm_template.c | 2 +- demo/cdc_rndis_template.c | 2 +- demo/dfu_with_st_tool_template.c | 2 +- demo/hid_custom_inout_template.c | 2 +- demo/hid_keyboard_template.c | 2 +- demo/hid_mouse_template.c | 2 +- demo/hid_remote_wakeup_template.c | 2 +- demo/midi_template.c | 2 +- demo/msc_ram_template.c | 2 +- demo/msc_storage_template.c | 2 +- demo/video_audiov1_hid_template.c | 2 +- demo/video_static_h264_template.c | 2 +- demo/video_static_mjpeg_template.c | 2 +- demo/video_static_yuyv_template.c | 2 +- demo/webusb_hid_template.c | 2 +- demo/winusb1.0_template.c | 2 +- demo/winusb2.0_cdc_template.c | 2 +- demo/winusb2.0_hid_template.c | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/demo/audio_v1_mic_multichan_template.c b/demo/audio_v1_mic_multichan_template.c index a80a221a..b0d631e2 100644 --- a/demo/audio_v1_mic_multichan_template.c +++ b/demo/audio_v1_mic_multichan_template.c @@ -212,7 +212,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_IN_EP }, }; -void audio_v1_init(uint8_t busid, uint32_t reg_base) +void audio_v1_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, audio_v1_descriptor); usbd_add_interface(busid, usbd_audio_init_intf(busid, &intf0, 0x0100, audio_entity_table, 1)); diff --git a/demo/audio_v1_mic_speaker_multichan_template.c b/demo/audio_v1_mic_speaker_multichan_template.c index fbd53e31..6275de1c 100644 --- a/demo/audio_v1_mic_speaker_multichan_template.c +++ b/demo/audio_v1_mic_speaker_multichan_template.c @@ -238,7 +238,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_OUT_EP }, }; -void audio_v1_init(uint8_t busid, uint32_t reg_base) +void audio_v1_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, audio_v1_descriptor); usbd_add_interface(busid, usbd_audio_init_intf(busid, &intf0, 0x0100, audio_entity_table, 2)); diff --git a/demo/audio_v2_mic_multichan_template.c b/demo/audio_v2_mic_multichan_template.c index bf85762c..69fff0c5 100644 --- a/demo/audio_v2_mic_multichan_template.c +++ b/demo/audio_v2_mic_multichan_template.c @@ -229,7 +229,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_IN_EP }, }; -void audio_v2_init(uint8_t busid, uint32_t reg_base) +void audio_v2_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, audio_v2_descriptor); usbd_add_interface(busid, usbd_audio_init_intf(busid, &intf0, 0x0200, audio_entity_table, 2)); diff --git a/demo/audio_v2_mic_speaker_multichan_template.c b/demo/audio_v2_mic_speaker_multichan_template.c index e8afabe6..9bf4c2c5 100644 --- a/demo/audio_v2_mic_speaker_multichan_template.c +++ b/demo/audio_v2_mic_speaker_multichan_template.c @@ -346,7 +346,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_IN_EP }, }; -void audio_v2_init(uint8_t busid, uint32_t reg_base) +void audio_v2_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, audio_v2_descriptor); usbd_add_interface(busid, usbd_audio_init_intf(busid, &intf0, 0x0200, audio_entity_table, 4)); diff --git a/demo/audio_v2_speaker_multichan_template.c b/demo/audio_v2_speaker_multichan_template.c index 3fc7a48b..928aaaf6 100644 --- a/demo/audio_v2_speaker_multichan_template.c +++ b/demo/audio_v2_speaker_multichan_template.c @@ -247,7 +247,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_OUT_EP }, }; -void audio_v2_init(uint8_t busid, uint32_t reg_base) +void audio_v2_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, audio_v2_descriptor); usbd_add_interface(busid, usbd_audio_init_intf(busid, &intf0, 0x0200, audio_entity_table, 2)); diff --git a/demo/bootuf2/msc_bootuf2_template.c b/demo/bootuf2/msc_bootuf2_template.c index 05d380d0..7702e48f 100644 --- a/demo/bootuf2/msc_bootuf2_template.c +++ b/demo/bootuf2/msc_bootuf2_template.c @@ -148,7 +148,7 @@ int usbd_msc_sector_write(uint8_t busid, uint8_t lun, uint32_t sector, uint8_t * static struct usbd_interface intf0; -void msc_bootuf2_init(uint8_t busid, uint32_t reg_base) +void msc_bootuf2_init(uint8_t busid, uintptr_t reg_base) { boot2uf2_flash_init(); usbd_desc_register(busid, msc_bootuf2_descriptor); diff --git a/demo/cdc_acm_hid_msc_template.c b/demo/cdc_acm_hid_msc_template.c index 93a3dc13..11804144 100644 --- a/demo/cdc_acm_hid_msc_template.c +++ b/demo/cdc_acm_hid_msc_template.c @@ -301,7 +301,7 @@ struct usbd_interface intf1; struct usbd_interface intf2; struct usbd_interface intf3; -void cdc_acm_hid_msc_descriptor_init(uint8_t busid, uint32_t reg_base) +void cdc_acm_hid_msc_descriptor_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, cdc_acm_hid_msc_descriptor); diff --git a/demo/cdc_acm_msc_template.c b/demo/cdc_acm_msc_template.c index 7ab58106..be0dc3d5 100644 --- a/demo/cdc_acm_msc_template.c +++ b/demo/cdc_acm_msc_template.c @@ -247,7 +247,7 @@ struct usbd_interface intf0; struct usbd_interface intf1; struct usbd_interface intf2; -void cdc_acm_msc_init(uint8_t busid, uint32_t reg_base) +void cdc_acm_msc_init(uint8_t busid, uintptr_t reg_base) { #ifdef CONFIG_USBDEV_ADVANCE_DESC usbd_desc_register(busid, &cdc_msc_descriptor); diff --git a/demo/cdc_acm_multi_template.c b/demo/cdc_acm_multi_template.c index fa3eb650..ace26368 100644 --- a/demo/cdc_acm_multi_template.c +++ b/demo/cdc_acm_multi_template.c @@ -223,7 +223,7 @@ struct usbd_interface intf5; struct usbd_interface intf6; struct usbd_interface intf7; -void cdc_acm_multi_init(uint8_t busid, uint32_t reg_base) +void cdc_acm_multi_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, cdc_descriptor); diff --git a/demo/cdc_acm_template.c b/demo/cdc_acm_template.c index 490b7169..c822a436 100644 --- a/demo/cdc_acm_template.c +++ b/demo/cdc_acm_template.c @@ -174,7 +174,7 @@ struct usbd_endpoint cdc_in_ep = { static struct usbd_interface intf0; static struct usbd_interface intf1; -void cdc_acm_init(uint8_t busid, uint32_t reg_base) +void cdc_acm_init(uint8_t busid, uintptr_t reg_base) { const uint8_t data[10] = { 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30 }; diff --git a/demo/cdc_ecm_template.c b/demo/cdc_ecm_template.c index fd58a299..37ad1ea0 100644 --- a/demo/cdc_ecm_template.c +++ b/demo/cdc_ecm_template.c @@ -269,7 +269,7 @@ struct usbd_interface intf1; * sudo ifconfig enxaabbccddeeff up * sudo dhcpclient enxaabbccddeeff */ -void cdc_ecm_init(uint8_t busid, uint32_t reg_base) +void cdc_ecm_init(uint8_t busid, uintptr_t reg_base) { cdc_ecm_lwip_init(); diff --git a/demo/cdc_rndis_template.c b/demo/cdc_rndis_template.c index cb4aef62..cd20842a 100644 --- a/demo/cdc_rndis_template.c +++ b/demo/cdc_rndis_template.c @@ -304,7 +304,7 @@ static void usbd_event_handler(uint8_t busid, uint8_t event) struct usbd_interface intf0; struct usbd_interface intf1; -void cdc_rndis_init(uint8_t busid, uint32_t reg_base) +void cdc_rndis_init(uint8_t busid, uintptr_t reg_base) { #ifdef RT_USING_LWIP rt_usbd_rndis_init(); diff --git a/demo/dfu_with_st_tool_template.c b/demo/dfu_with_st_tool_template.c index 1d947024..aaad7681 100644 --- a/demo/dfu_with_st_tool_template.c +++ b/demo/dfu_with_st_tool_template.c @@ -169,7 +169,7 @@ static void usbd_event_handler(uint8_t busid, uint8_t event) struct usbd_interface intf0; -void dfu_flash_init(uint8_t busid, uint32_t reg_base) +void dfu_flash_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, dfu_flash_descriptor); usbd_add_interface(busid, usbd_dfu_init_intf(&intf0)); diff --git a/demo/hid_custom_inout_template.c b/demo/hid_custom_inout_template.c index 92bca37b..1ef5d547 100644 --- a/demo/hid_custom_inout_template.c +++ b/demo/hid_custom_inout_template.c @@ -272,7 +272,7 @@ static struct usbd_endpoint custom_out_ep = { */ struct usbd_interface intf0; -void hid_custom_init(uint8_t busid, uint32_t reg_base) +void hid_custom_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, hid_descriptor); usbd_add_interface(busid, usbd_hid_init_intf(busid, &intf0, hid_custom_report_desc, HID_CUSTOM_REPORT_DESC_SIZE)); diff --git a/demo/hid_keyboard_template.c b/demo/hid_keyboard_template.c index 5e106f26..ace3fed0 100644 --- a/demo/hid_keyboard_template.c +++ b/demo/hid_keyboard_template.c @@ -221,7 +221,7 @@ static struct usbd_endpoint hid_in_ep = { struct usbd_interface intf0; -void hid_keyboard_init(uint8_t busid, uint32_t reg_base) +void hid_keyboard_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, hid_descriptor); usbd_add_interface(busid, usbd_hid_init_intf(busid, &intf0, hid_keyboard_report_desc, HID_KEYBOARD_REPORT_DESC_SIZE)); diff --git a/demo/hid_mouse_template.c b/demo/hid_mouse_template.c index e605592f..6b2e690e 100644 --- a/demo/hid_mouse_template.c +++ b/demo/hid_mouse_template.c @@ -239,7 +239,7 @@ static struct usbd_endpoint hid_in_ep = { struct usbd_interface intf0; -void hid_mouse_init(uint8_t busid, uint32_t reg_base) +void hid_mouse_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, hid_descriptor); usbd_add_interface(busid, usbd_hid_init_intf(busid, &intf0, hid_mouse_report_desc, HID_MOUSE_REPORT_DESC_SIZE)); diff --git a/demo/hid_remote_wakeup_template.c b/demo/hid_remote_wakeup_template.c index a1334245..6ce67a49 100644 --- a/demo/hid_remote_wakeup_template.c +++ b/demo/hid_remote_wakeup_template.c @@ -239,7 +239,7 @@ static struct usbd_endpoint hid_in_ep = { static struct usbd_interface intf0; -void hid_mouse_init(uint8_t busid, uint32_t reg_base) +void hid_mouse_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, hid_descriptor); usbd_add_interface(busid, usbd_hid_init_intf(busid, &intf0, hid_mouse_report_desc, HID_MOUSE_REPORT_DESC_SIZE)); diff --git a/demo/midi_template.c b/demo/midi_template.c index d09a9430..766d2952 100644 --- a/demo/midi_template.c +++ b/demo/midi_template.c @@ -202,7 +202,7 @@ struct usbd_endpoint midi_in_ep = { .ep_cb = usbd_midi_bulk_in }; -void midi_init(uint8_t busid, uint32_t reg_base) +void midi_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, midi_descriptor); usbd_add_interface(busid, &intf0); diff --git a/demo/msc_ram_template.c b/demo/msc_ram_template.c index 00810635..cd38bdfb 100644 --- a/demo/msc_ram_template.c +++ b/demo/msc_ram_template.c @@ -156,7 +156,7 @@ int usbd_msc_sector_write(uint8_t busid, uint8_t lun, uint32_t sector, uint8_t * static struct usbd_interface intf0; -void msc_ram_init(uint8_t busid, uint32_t reg_base) +void msc_ram_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, msc_ram_descriptor); usbd_add_interface(busid, usbd_msc_init_intf(busid, &intf0, MSC_OUT_EP, MSC_IN_EP)); diff --git a/demo/msc_storage_template.c b/demo/msc_storage_template.c index a3351643..73bc4d45 100644 --- a/demo/msc_storage_template.c +++ b/demo/msc_storage_template.c @@ -154,7 +154,7 @@ int usbd_msc_sector_write(uint8_t busid, uint8_t lun, uint32_t sector, uint8_t * return 0; } -void msc_storage_init(uint8_t busid, uint32_t reg_base) +void msc_storage_init(uint8_t busid, uintptr_t reg_base) { rt_err_t res; diff --git a/demo/video_audiov1_hid_template.c b/demo/video_audiov1_hid_template.c index 97f1743a..87906ee7 100644 --- a/demo/video_audiov1_hid_template.c +++ b/demo/video_audiov1_hid_template.c @@ -416,7 +416,7 @@ struct audio_entity_info audio_entity_table[] = { .ep = AUDIO_OUT_EP }, }; -void composite_init(uint8_t busid, uint32_t reg_base) +void composite_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, video_audio_hid_descriptor); usbd_add_interface(busid, usbd_video_init_intf(busid, &intf0, INTERVAL, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); diff --git a/demo/video_static_h264_template.c b/demo/video_static_h264_template.c index adfb879d..e9d5fe84 100644 --- a/demo/video_static_h264_template.c +++ b/demo/video_static_h264_template.c @@ -192,7 +192,7 @@ static struct usbd_endpoint video_in_ep = { struct usbd_interface intf0; struct usbd_interface intf1; -void video_init(uint8_t busid, uint32_t reg_base) +void video_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, video_descriptor); usbd_add_interface(busid, usbd_video_init_intf(busid, &intf0, INTERVAL, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); diff --git a/demo/video_static_mjpeg_template.c b/demo/video_static_mjpeg_template.c index 85b659d4..c167c8a2 100644 --- a/demo/video_static_mjpeg_template.c +++ b/demo/video_static_mjpeg_template.c @@ -192,7 +192,7 @@ static struct usbd_endpoint video_in_ep = { struct usbd_interface intf0; struct usbd_interface intf1; -void video_init(uint8_t busid, uint32_t reg_base) +void video_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, video_descriptor); usbd_add_interface(busid, usbd_video_init_intf(busid, &intf0, INTERVAL, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); diff --git a/demo/video_static_yuyv_template.c b/demo/video_static_yuyv_template.c index febbaf9b..0ee736a9 100644 --- a/demo/video_static_yuyv_template.c +++ b/demo/video_static_yuyv_template.c @@ -194,7 +194,7 @@ static struct usbd_endpoint video_in_ep = { struct usbd_interface intf0; struct usbd_interface intf1; -void video_init(uint8_t busid, uint32_t reg_base) +void video_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, video_descriptor); usbd_add_interface(busid, usbd_video_init_intf(busid, &intf0, INTERVAL, MAX_FRAME_SIZE, MAX_PAYLOAD_SIZE)); diff --git a/demo/webusb_hid_template.c b/demo/webusb_hid_template.c index 7dd0845b..142a195c 100644 --- a/demo/webusb_hid_template.c +++ b/demo/webusb_hid_template.c @@ -353,7 +353,7 @@ static struct usbd_endpoint hid_in_ep = { static struct usbd_interface intf0; -void webusb_hid_keyboard_init(uint8_t busid, uint32_t reg_base) +void webusb_hid_keyboard_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, webusb_hid_descriptor); usbd_bos_desc_register(busid, &bos_desc); diff --git a/demo/winusb1.0_template.c b/demo/winusb1.0_template.c index ccec686c..25b6e3b9 100644 --- a/demo/winusb1.0_template.c +++ b/demo/winusb1.0_template.c @@ -444,7 +444,7 @@ struct usbd_interface intf1; #endif -void winusb_init(uint8_t busid, uint32_t reg_base) +void winusb_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, winusb_descriptor); usbd_msosv1_desc_register(busid, &msosv1_desc); diff --git a/demo/winusb2.0_cdc_template.c b/demo/winusb2.0_cdc_template.c index 8fe6e995..c4940672 100644 --- a/demo/winusb2.0_cdc_template.c +++ b/demo/winusb2.0_cdc_template.c @@ -318,7 +318,7 @@ struct usb_bos_descriptor bos_desc = { .string_len = USBD_BOS_WTOTALLENGTH }; -void winusbv2_init(uint8_t busid, uint32_t reg_base) +void winusbv2_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, winusbv2_descriptor); usbd_bos_desc_register(busid, &bos_desc); diff --git a/demo/winusb2.0_hid_template.c b/demo/winusb2.0_hid_template.c index 8df623ed..c33cfa76 100644 --- a/demo/winusb2.0_hid_template.c +++ b/demo/winusb2.0_hid_template.c @@ -422,7 +422,7 @@ struct usb_bos_descriptor bos_desc = { .string_len = USBD_BOS_WTOTALLENGTH }; -void winusbv2_init(uint8_t busid, uint32_t reg_base) +void winusbv2_init(uint8_t busid, uintptr_t reg_base) { usbd_desc_register(busid, winusbv2_descriptor); usbd_bos_desc_register(busid, &bos_desc);