From 39431f5a702f3dcec843cb8884064953594243ec Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Thu, 30 Apr 2020 15:47:42 +0800 Subject: [PATCH 1/3] Rename usbd and usbh source files for IAR building issue. --- components/drivers/usb/usbdevice/SConscript | 2 +- components/drivers/usb/usbdevice/core/{core.c => ud_core.c} | 0 components/drivers/usb/usbhost/SConscript | 2 +- components/drivers/usb/usbhost/core/{core.c => uh_core.c} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename components/drivers/usb/usbdevice/core/{core.c => ud_core.c} (100%) rename components/drivers/usb/usbhost/core/{core.c => uh_core.c} (100%) diff --git a/components/drivers/usb/usbdevice/SConscript b/components/drivers/usb/usbdevice/SConscript index 010b9837a4..876875f8bc 100644 --- a/components/drivers/usb/usbdevice/SConscript +++ b/components/drivers/usb/usbdevice/SConscript @@ -3,7 +3,7 @@ from building import * cwd = GetCurrentDir() src = Split(""" -core/core.c +core/ud_core.c core/usbdevice.c """) diff --git a/components/drivers/usb/usbdevice/core/core.c b/components/drivers/usb/usbdevice/core/ud_core.c similarity index 100% rename from components/drivers/usb/usbdevice/core/core.c rename to components/drivers/usb/usbdevice/core/ud_core.c diff --git a/components/drivers/usb/usbhost/SConscript b/components/drivers/usb/usbhost/SConscript index b12adfc5ad..f497f8868d 100644 --- a/components/drivers/usb/usbhost/SConscript +++ b/components/drivers/usb/usbhost/SConscript @@ -3,7 +3,7 @@ from building import * cwd = GetCurrentDir() src = Split(""" -core/core.c +core/uh_core.c core/driver.c core/usbhost.c core/hub.c diff --git a/components/drivers/usb/usbhost/core/core.c b/components/drivers/usb/usbhost/core/uh_core.c similarity index 100% rename from components/drivers/usb/usbhost/core/core.c rename to components/drivers/usb/usbhost/core/uh_core.c From 267c3ec68354d9e05224bf92ccc6be9358908958 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Fri, 15 May 2020 09:46:01 +0800 Subject: [PATCH 2/3] Fix rt_hw_inputcapture_isr public function name in header file. Fix miss-break in HWTIMER_CTRL_INFO_GET case. --- components/drivers/hwtimer/hwtimer.c | 1 + components/drivers/include/drivers/rt_inputcapture.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/drivers/hwtimer/hwtimer.c b/components/drivers/hwtimer/hwtimer.c index 83a76c7b9d..3953919fae 100644 --- a/components/drivers/hwtimer/hwtimer.c +++ b/components/drivers/hwtimer/hwtimer.c @@ -255,6 +255,7 @@ static rt_err_t rt_hwtimer_control(struct rt_device *dev, int cmd, void *args) *((struct rt_hwtimer_info*)args) = *timer->info; } + break; case HWTIMER_CTRL_MODE_SET: { rt_hwtimer_mode_t *m; diff --git a/components/drivers/include/drivers/rt_inputcapture.h b/components/drivers/include/drivers/rt_inputcapture.h index 0cadf6444c..40cd55883d 100644 --- a/components/drivers/include/drivers/rt_inputcapture.h +++ b/components/drivers/include/drivers/rt_inputcapture.h @@ -48,7 +48,7 @@ struct rt_inputcapture_ops rt_err_t (*get_pulsewidth)(struct rt_inputcapture_device *inputcapture, rt_uint32_t *pulsewidth_us); }; -void rt_hw_capture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level); +void rt_hw_inputcapture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level); rt_err_t rt_device_inputcapture_register(struct rt_inputcapture_device *inputcapture, const char *name, From f0e4009c30d1597c756db4c03e97d3b75e730888 Mon Sep 17 00:00:00 2001 From: Wayne Lin Date: Fri, 15 May 2020 09:46:01 +0800 Subject: [PATCH 3/3] Fix rt_hw_inputcapture_isr public function name in header file. Fix miss-break in HWTIMER_CTRL_INFO_GET case. --- components/drivers/hwtimer/hwtimer.c | 1 + components/drivers/include/drivers/rt_inputcapture.h | 2 +- components/drivers/usb/usbdevice/SConscript | 2 +- .../drivers/usb/usbdevice/core/{ud_core.c => usbdevice_core.c} | 0 components/drivers/usb/usbhost/SConscript | 2 +- .../drivers/usb/usbhost/core/{uh_core.c => usbhost_core.c} | 0 6 files changed, 4 insertions(+), 3 deletions(-) rename components/drivers/usb/usbdevice/core/{ud_core.c => usbdevice_core.c} (100%) rename components/drivers/usb/usbhost/core/{uh_core.c => usbhost_core.c} (100%) diff --git a/components/drivers/hwtimer/hwtimer.c b/components/drivers/hwtimer/hwtimer.c index 83a76c7b9d..3953919fae 100644 --- a/components/drivers/hwtimer/hwtimer.c +++ b/components/drivers/hwtimer/hwtimer.c @@ -255,6 +255,7 @@ static rt_err_t rt_hwtimer_control(struct rt_device *dev, int cmd, void *args) *((struct rt_hwtimer_info*)args) = *timer->info; } + break; case HWTIMER_CTRL_MODE_SET: { rt_hwtimer_mode_t *m; diff --git a/components/drivers/include/drivers/rt_inputcapture.h b/components/drivers/include/drivers/rt_inputcapture.h index 0cadf6444c..40cd55883d 100644 --- a/components/drivers/include/drivers/rt_inputcapture.h +++ b/components/drivers/include/drivers/rt_inputcapture.h @@ -48,7 +48,7 @@ struct rt_inputcapture_ops rt_err_t (*get_pulsewidth)(struct rt_inputcapture_device *inputcapture, rt_uint32_t *pulsewidth_us); }; -void rt_hw_capture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level); +void rt_hw_inputcapture_isr(struct rt_inputcapture_device *inputcapture, rt_bool_t level); rt_err_t rt_device_inputcapture_register(struct rt_inputcapture_device *inputcapture, const char *name, diff --git a/components/drivers/usb/usbdevice/SConscript b/components/drivers/usb/usbdevice/SConscript index 876875f8bc..b6dfa8da10 100644 --- a/components/drivers/usb/usbdevice/SConscript +++ b/components/drivers/usb/usbdevice/SConscript @@ -3,7 +3,7 @@ from building import * cwd = GetCurrentDir() src = Split(""" -core/ud_core.c +core/usbdevice_core.c core/usbdevice.c """) diff --git a/components/drivers/usb/usbdevice/core/ud_core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c similarity index 100% rename from components/drivers/usb/usbdevice/core/ud_core.c rename to components/drivers/usb/usbdevice/core/usbdevice_core.c diff --git a/components/drivers/usb/usbhost/SConscript b/components/drivers/usb/usbhost/SConscript index f497f8868d..081c732819 100644 --- a/components/drivers/usb/usbhost/SConscript +++ b/components/drivers/usb/usbhost/SConscript @@ -3,7 +3,7 @@ from building import * cwd = GetCurrentDir() src = Split(""" -core/uh_core.c +core/usbhost_core.c core/driver.c core/usbhost.c core/hub.c diff --git a/components/drivers/usb/usbhost/core/uh_core.c b/components/drivers/usb/usbhost/core/usbhost_core.c similarity index 100% rename from components/drivers/usb/usbhost/core/uh_core.c rename to components/drivers/usb/usbhost/core/usbhost_core.c