From 675fa48281f6511ba0c10e443868e911747f8729 Mon Sep 17 00:00:00 2001 From: pangweishen <271372443@qq.com> Date: Tue, 4 Nov 2014 10:16:54 +0800 Subject: modified the comments of block device geometry structure, to tell everyone the unit of block_size is byte. --- include/rtdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/rtdef.h b/include/rtdef.h index 01ccc3fc44..55f6e6b945 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -844,7 +844,7 @@ struct rt_device_blk_geometry { rt_uint32_t sector_count; /**< count of sectors */ rt_uint32_t bytes_per_sector; /**< number of bytes per sector */ - rt_uint32_t block_size; /**< size to erase one block */ + rt_uint32_t block_size; /**< number of bytes to erase one block */ }; /** -- cgit v1.3.1 From 204298c1b231330423bc95efb0fcc4eb04d89ef9 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Mon, 2 Feb 2015 13:22:38 +0800 Subject: Update rtdef.h --- include/rtdef.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/rtdef.h b/include/rtdef.h index 55f6e6b945..78a5642058 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -1,7 +1,7 @@ /* * File : rtdef.h * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team + * COPYRIGHT (C) 2006 - 2015, RT-Thread Development Team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,6 +29,7 @@ * RT_USING_MEMHEAP condition. * 2012-12-30 Bernard add more control command for graphic. * 2013-01-09 Bernard change version number. + * 2015-02-01 Bernard change version number to v2.1.0 */ #ifndef __RT_DEF_H__ @@ -49,7 +50,7 @@ extern "C" { /* RT-Thread version information */ #define RT_VERSION 2L /**< major version number */ -#define RT_SUBVERSION 0L /**< minor version number */ +#define RT_SUBVERSION 1L /**< minor version number */ #define RT_REVISION 0L /**< revise version number */ /* RT-Thread version */ -- cgit v1.3.1 From 7caabd2b7ab591cba1bccc3641ab8c0300654bfc Mon Sep 17 00:00:00 2001 From: "Aubr.Cool" Date: Thu, 26 Mar 2015 08:40:36 +0800 Subject: mv device ctl cmd macros from serial.h to rtdef.h --- components/drivers/include/drivers/serial.h | 5 ----- include/rtdef.h | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'include') diff --git a/components/drivers/include/drivers/serial.h b/components/drivers/include/drivers/serial.h index bf2a25ae1e..3b0a009072 100644 --- a/components/drivers/include/drivers/serial.h +++ b/components/drivers/include/drivers/serial.h @@ -65,11 +65,6 @@ #define RT_SERIAL_RB_BUFSZ 64 #endif -#define RT_DEVICE_CTRL_CONFIG 0x03 /* configure device */ -#define RT_DEVICE_CTRL_SET_INT 0x10 /* enable receive irq */ -#define RT_DEVICE_CTRL_CLR_INT 0x11 /* disable receive irq */ -#define RT_DEVICE_CTRL_GET_INT 0x12 - #define RT_SERIAL_EVENT_RX_IND 0x01 /* Rx indication */ #define RT_SERIAL_EVENT_TX_DONE 0x02 /* Tx complete */ #define RT_SERIAL_EVENT_RX_DMADONE 0x03 /* Rx DMA transfer done */ diff --git a/include/rtdef.h b/include/rtdef.h index 78a5642058..4c3581b91a 100644 --- a/include/rtdef.h +++ b/include/rtdef.h @@ -776,6 +776,11 @@ enum rt_device_class_type #define RT_DEVICE_FLAG_SUSPENDED 0x020 /**< device is suspended */ #define RT_DEVICE_FLAG_STREAM 0x040 /**< stream mode */ +#define RT_DEVICE_CTRL_CONFIG 0x03 /* configure device */ +#define RT_DEVICE_CTRL_SET_INT 0x10 /* enable receive irq */ +#define RT_DEVICE_CTRL_CLR_INT 0x11 /* disable receive irq */ +#define RT_DEVICE_CTRL_GET_INT 0x12 + #define RT_DEVICE_FLAG_INT_RX 0x100 /**< INT mode on Rx */ #define RT_DEVICE_FLAG_DMA_RX 0x200 /**< DMA mode on Rx */ #define RT_DEVICE_FLAG_INT_TX 0x400 /**< INT mode on Tx */ -- cgit v1.3.1