diff options
| author | Bernard Xiong <[email protected]> | 2020-05-30 09:43:54 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-05-30 09:43:54 +0800 |
| commit | 1ef77bd969b56236f74c4a11f12b4d047dfb9b51 (patch) | |
| tree | 59d2deb66ac1f81858c551ac3e937c9ba39a9c52 /components/drivers | |
| parent | 423270936ac9b9abd332c8e58ecffbc64abf7090 (diff) | |
| parent | 3c4da443699d264eb5d7f4a407d907bab555f142 (diff) | |
Merge pull request #3601 from OpenNuvoton/rtt_issues
Fix issues
Diffstat (limited to 'components/drivers')
| -rw-r--r-- | components/drivers/hwtimer/hwtimer.c | 1 | ||||
| -rw-r--r-- | components/drivers/include/drivers/rt_inputcapture.h | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbdevice/core/usbdevice_core.c (renamed from components/drivers/usb/usbdevice/core/core.c) | 0 | ||||
| -rw-r--r-- | components/drivers/usb/usbhost/SConscript | 2 | ||||
| -rw-r--r-- | components/drivers/usb/usbhost/core/usbhost_core.c (renamed from components/drivers/usb/usbhost/core/core.c) | 0 |
6 files changed, 4 insertions, 3 deletions
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 010b9837a4..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/core.c +core/usbdevice_core.c core/usbdevice.c """) diff --git a/components/drivers/usb/usbdevice/core/core.c b/components/drivers/usb/usbdevice/core/usbdevice_core.c index ef569d7bf2..ef569d7bf2 100644 --- a/components/drivers/usb/usbdevice/core/core.c +++ b/components/drivers/usb/usbdevice/core/usbdevice_core.c diff --git a/components/drivers/usb/usbhost/SConscript b/components/drivers/usb/usbhost/SConscript index b12adfc5ad..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/core.c +core/usbhost_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/usbhost_core.c index 71341a33c3..71341a33c3 100644 --- a/components/drivers/usb/usbhost/core/core.c +++ b/components/drivers/usb/usbhost/core/usbhost_core.c |