From 4c9b77ded6232051f966453d4863ad4eeffd5bad Mon Sep 17 00:00:00 2001 From: armink Date: Wed, 11 May 2016 13:34:18 +0800 Subject: [DeviceDrivers]Fix dma_transmit callback parameter type error. #628 --- components/drivers/include/drivers/serial.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'components/drivers/include') diff --git a/components/drivers/include/drivers/serial.h b/components/drivers/include/drivers/serial.h index 3b0a009072..46c94547fd 100644 --- a/components/drivers/include/drivers/serial.h +++ b/components/drivers/include/drivers/serial.h @@ -106,7 +106,7 @@ struct serial_configure rt_uint32_t parity :2; rt_uint32_t bit_order :1; rt_uint32_t invert :1; - rt_uint32_t bufsz :16; + rt_uint32_t bufsz :16; rt_uint32_t reserved :4; }; @@ -115,15 +115,15 @@ struct serial_configure */ struct rt_serial_rx_fifo { - /* software fifo */ - rt_uint8_t *buffer; + /* software fifo */ + rt_uint8_t *buffer; - rt_uint16_t put_index, get_index; + rt_uint16_t put_index, get_index; }; struct rt_serial_tx_fifo { - struct rt_completion completion; + struct rt_completion completion; }; /* @@ -131,13 +131,13 @@ struct rt_serial_tx_fifo */ struct rt_serial_rx_dma { - rt_bool_t activated; + rt_bool_t activated; }; struct rt_serial_tx_dma { - rt_bool_t activated; - struct rt_data_queue data_queue; + rt_bool_t activated; + struct rt_data_queue data_queue; }; struct rt_serial_device @@ -147,8 +147,8 @@ struct rt_serial_device const struct rt_uart_ops *ops; struct serial_configure config; - void *serial_rx; - void *serial_tx; + void *serial_rx; + void *serial_tx; }; typedef struct rt_serial_device rt_serial_t; @@ -163,7 +163,7 @@ struct rt_uart_ops int (*putc)(struct rt_serial_device *serial, char c); int (*getc)(struct rt_serial_device *serial); - rt_size_t (*dma_transmit)(struct rt_serial_device *serial, const rt_uint8_t *buf, rt_size_t size, int direction); + rt_size_t (*dma_transmit)(struct rt_serial_device *serial, rt_uint8_t *buf, rt_size_t size, int direction); }; void rt_hw_serial_isr(struct rt_serial_device *serial, int event); @@ -174,4 +174,3 @@ rt_err_t rt_hw_serial_register(struct rt_serial_device *serial, void *data); #endif - -- cgit v1.3.1 From 02a5cebc6dd19f0f209d75ca2f79aa6384450434 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Fri, 20 May 2016 12:20:35 +0800 Subject: [DeviceDrivers] Add MMC/SD change support. Add MMC/SD change support, which patched by FH. --- components/drivers/include/drivers/mmcsd_core.h | 4 ++++ components/drivers/sdio/mmcsd_core.c | 30 +++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) (limited to 'components/drivers/include') diff --git a/components/drivers/include/drivers/mmcsd_core.h b/components/drivers/include/drivers/mmcsd_core.h index 1e5560b893..e474fa28a8 100644 --- a/components/drivers/include/drivers/mmcsd_core.h +++ b/components/drivers/include/drivers/mmcsd_core.h @@ -220,6 +220,10 @@ rt_inline rt_uint32_t fls(rt_uint32_t val) return bit; } +#define MMCSD_HOST_PLUGED 0 +#define MMCSD_HOST_UNPLUGED 1 + +int mmcsd_wait_cd_changed(rt_int32_t timeout); void mmcsd_host_lock(struct rt_mmcsd_host *host); void mmcsd_host_unlock(struct rt_mmcsd_host *host); void mmcsd_req_complete(struct rt_mmcsd_host *host); diff --git a/components/drivers/sdio/mmcsd_core.c b/components/drivers/sdio/mmcsd_core.c index 0cbf8f1892..adda6a4910 100644 --- a/components/drivers/sdio/mmcsd_core.c +++ b/components/drivers/sdio/mmcsd_core.c @@ -44,6 +44,8 @@ static struct rt_thread mmcsd_detect_thread; static rt_uint8_t mmcsd_stack[RT_MMCSD_STACK_SIZE]; static struct rt_mailbox mmcsd_detect_mb; static rt_uint32_t mmcsd_detect_mb_pool[4]; +static struct rt_mailbox mmcsd_hotpluge_mb; +static rt_uint32_t mmcsd_hotpluge_mb_pool[4]; void mmcsd_host_lock(struct rt_mmcsd_host *host) { @@ -594,6 +596,24 @@ static void mmcsd_power_off(struct rt_mmcsd_host *host) mmcsd_set_iocfg(host); } +int mmcsd_wait_cd_changed(rt_int32_t timeout) +{ + struct rt_mmcsd_host *host; + if (rt_mb_recv(&mmcsd_hotpluge_mb, (rt_uint32_t*)&host, timeout) == RT_EOK) + { + if(host->card == RT_NULL) + { + return MMCSD_HOST_UNPLUGED; + } + else + { + return MMCSD_HOST_PLUGED; + } + } + return -RT_ETIMEOUT; +} +RTM_EXPORT(mmcsd_wait_cd_changed); + void mmcsd_change(struct rt_mmcsd_host *host) { rt_mb_send(&mmcsd_detect_mb, (rt_uint32_t)host); @@ -647,6 +667,7 @@ void mmcsd_detect(void *param) if (init_mmc(host, ocr)) mmcsd_power_off(host); mmcsd_host_unlock(host); + rt_mb_send(&mmcsd_hotpluge_mb, (rt_uint32_t)host); continue; } mmcsd_host_unlock(host); @@ -667,6 +688,7 @@ void mmcsd_detect(void *param) host->card = RT_NULL; } mmcsd_host_unlock(host); + rt_mb_send(&mmcsd_hotpluge_mb, (rt_uint32_t)host); } } } @@ -711,11 +733,15 @@ void rt_mmcsd_core_init(void) /* initialize detect SD cart thread */ /* initialize mailbox and create detect SD card thread */ ret = rt_mb_init(&mmcsd_detect_mb, "mmcsdmb", - &mmcsd_detect_mb_pool[0], sizeof(mmcsd_detect_mb_pool), + &mmcsd_detect_mb_pool[0], sizeof(mmcsd_detect_mb_pool) / sizeof(mmcsd_detect_mb_pool[0]), RT_IPC_FLAG_FIFO); RT_ASSERT(ret == RT_EOK); - ret = rt_thread_init(&mmcsd_detect_thread, "mmcsd_detect", mmcsd_detect, RT_NULL, + ret = rt_mb_init(&mmcsd_hotpluge_mb, "mmcsdhotplugmb", + &mmcsd_hotpluge_mb_pool[0], sizeof(mmcsd_hotpluge_mb_pool) / sizeof(mmcsd_hotpluge_mb_pool[0]), + RT_IPC_FLAG_FIFO); + RT_ASSERT(ret == RT_EOK); + ret = rt_thread_init(&mmcsd_detect_thread, "mmcsd_detect", mmcsd_detect, RT_NULL, &mmcsd_stack[0], RT_MMCSD_STACK_SIZE, RT_MMCSD_THREAD_PREORITY, 20); if (ret == RT_EOK) { -- cgit v1.3.1 From f005d963e2f1012fa91eb30033d4013328232c43 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Fri, 20 May 2016 12:22:16 +0800 Subject: [DeviceDrivers] Add more baud rate in serial. --- components/drivers/include/drivers/serial.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'components/drivers/include') diff --git a/components/drivers/include/drivers/serial.h b/components/drivers/include/drivers/serial.h index 46c94547fd..c7e99ed472 100644 --- a/components/drivers/include/drivers/serial.h +++ b/components/drivers/include/drivers/serial.h @@ -33,12 +33,15 @@ #define BAUD_RATE_2400 2400 #define BAUD_RATE_4800 4800 #define BAUD_RATE_9600 9600 +#define BAUD_RATE_19200 19200 #define BAUD_RATE_38400 38400 #define BAUD_RATE_57600 57600 #define BAUD_RATE_115200 115200 #define BAUD_RATE_230400 230400 #define BAUD_RATE_460800 460800 #define BAUD_RATE_921600 921600 +#define BAUD_RATE_2000000 2000000 +#define BAUD_RATE_3000000 3000000 #define DATA_BITS_5 5 #define DATA_BITS_6 6 -- cgit v1.3.1