Skip to content

[components][dfs]Avoid colliding with POSIX by using the shifted 'ctr… #11881

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CXSforHPU wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[components][dfs]Avoid colliding with POSIX by using the shifted 'ctr… #11881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/drivers/include/drivers/dev_pin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ struct rt_device_pin
#ifdef RT_USING_PINCTRL
enum
{
PIN_CONFIG_BIAS_BUS_HOLD,
PIN_CONFIG_BIAS_BUS_HOLD = RT_DEVICE_CTRL_BASE(Pin) + 1,
PIN_CONFIG_BIAS_DISABLE,
PIN_CONFIG_BIAS_HIGH_IMPEDANCE,
PIN_CONFIG_BIAS_PULL_DOWN,
Expand Down
9 changes: 6 additions & 3 deletions components/drivers/include/drivers/dev_serial_v2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,12 @@
/**
* hw serial control commands
*/
#define RT_HW_SERIAL_CTRL_GETC 0x01 /* Tx irq get char */
#define RT_HW_SERIAL_CTRL_PUTC 0x02 /* Rx irq put char */
#define RT_HW_SERIAL_CTRL_GET_DMA_PING_BUF 0x03 /* Get DMA ping-pong buffer */
typedef enum rt_hw_serial_ctrl_cmd
{
RT_HW_SERIAL_CTRL_GETC = RT_DEVICE_CTRL_BASE(Char) + 1, /* Tx irq get char */
RT_HW_SERIAL_CTRL_PUTC, /* Rx irq put char */
RT_HW_SERIAL_CTRL_GET_DMA_PING_BUF, /* Get DMA ping-pong buffer */
} rt_hw_serial_ctrl_cmd_t;

/**
* hw isr event
Expand Down
46 changes: 30 additions & 16 deletions include/rtdef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1316,26 +1316,40 @@ enum rt_device_class_type
#define RT_DEVICE_OFLAG_MASK 0xf0f /**< mask of open flag */

/**
* general device commands
* 0x01 - 0x1F general device control commands
* 0x20 - 0x3F udevice control commands
* 0x40 - special device control commands
* device control base command
*/
#define RT_DEVICE_CTRL_RESUME 0x01 /**< resume device */
#define RT_DEVICE_CTRL_SUSPEND 0x02 /**< suspend device */
#define RT_DEVICE_CTRL_CONFIG 0x03 /**< configure device */
#define RT_DEVICE_CTRL_CLOSE 0x04 /**< close device */
#define RT_DEVICE_CTRL_NOTIFY_SET 0x05 /**< set notify func */
#define RT_DEVICE_CTRL_SET_INT 0x06 /**< set interrupt */
#define RT_DEVICE_CTRL_CLR_INT 0x07 /**< clear interrupt */
#define RT_DEVICE_CTRL_GET_INT 0x08 /**< get interrupt status */
#define RT_DEVICE_CTRL_CONSOLE_OFLAG 0x09 /**< get console open flag */
#define RT_DEVICE_CTRL_MASK 0x1f /**< mask for contrl commands */
#define RT_DEVICE_CTRL_BASE(Type) ((RT_Device_Class_##Type + 1) * 0x100)
#define RT_DEVICE_CTRL_CLASS_MASK 0xff00 /* High byte: class */
#define RT_DEVICE_CTRL_INDEX_MASK 0x00ff /* Low byte: index within class */

/**
* device control
* device control commands
*
* Layout (BASE(Type) = (RT_Device_Class_##Type + 1) * 0x100):
* high byte : class id (RT_DEVICE_CTRL_CLASS_MASK = 0xff00)
* low byte : index within class (RT_DEVICE_CTRL_INDEX_MASK = 0x00ff)
*
* The general-purpose commands below live in the Unknown class
* (Class_Unknown is the last entry in rt_device_class_t, so
* BASE(Unknown) = 0x2000), giving RESUME = 0x2001 .. CONSOLE_OFLAG = 0x2009.
* Class-specific commands should use BASE(Char), BASE(Block), ... instead
* of reusing these indices.
* 0x01 - 0x1F general device control commands
* 0x20 - 0x3F udevice control commands
* 0x40 - special device control commands
*/
#define RT_DEVICE_CTRL_BASE(Type) ((RT_Device_Class_##Type + 1) * 0x100)
typedef enum
{
RT_DEVICE_CTRL_RESUME = RT_DEVICE_CTRL_BASE(Unknown) + 1, /**< resume device */
RT_DEVICE_CTRL_SUSPEND, /**< suspend device */
RT_DEVICE_CTRL_CONFIG, /**< configure device */
RT_DEVICE_CTRL_CLOSE, /**< close device */
RT_DEVICE_CTRL_NOTIFY_SET, /**< set notify func */
RT_DEVICE_CTRL_SET_INT, /**< set interrupt */
RT_DEVICE_CTRL_CLR_INT, /**< clear interrupt */
RT_DEVICE_CTRL_GET_INT, /**< get interrupt status */
RT_DEVICE_CTRL_CONSOLE_OFLAG, /**< get console open flag */
} rt_device_cmd_t;

typedef struct rt_driver *rt_driver_t;
typedef struct rt_device *rt_device_t;
Expand Down
Loading