Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-07 01:05:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

can.h moved from include/nuttx/ to include/nuttx/drivers.

Browse Source
This commit is contained in:
Gregory Nutt
2016-07-20 13:38:36 -06:00
parent 4b4dbc79a2
commit ddcaa3d425
36 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nuttx/analog/adc.h
+1 -1
View File
@@ -6,7 +6,7 @@
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
* Gregory Nutt <gnutt@nuttx.org>
*
* Derived from include/nuttx/can.h
* Derived from include/nuttx/drivers/can.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
include/nuttx/analog/dac.h
+1 -1
View File
@@ -5,7 +5,7 @@
* Author: Li Zhuoyi <lzyy.cn@gmail.com>
* History: 0.1 2011-08-04 initial version
*
* Derived from include/nuttx/can.h
* Derived from include/nuttx/drivers/can.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
include/nuttx/can.h → include/nuttx/drivers/can.h
+9 -7
View File
@@ -1,7 +1,7 @@
/************************************************************************************
* include/nuttx/can.h
* include/nuttx/drivers/can.h
*
* Copyright (C) 2008, 2009, 2011-2012, 2015 Gregory Nutt. All rights reserved.
* Copyright (C) 2008, 2009, 2011-2012, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -33,8 +33,8 @@
*
************************************************************************************/
#ifndef _INCLUDE_NUTTX_CAN_H
#define _INCLUDE_NUTTX_CAN_H
#ifndef _INCLUDE_NUTTX_DRVERS_CAN_H
#define _INCLUDE_NUTTX_DRVERS_CAN_H
/************************************************************************************
* Included Files
@@ -60,9 +60,11 @@
/************************************************************************************
* Pre-processor Definitions
************************************************************************************/
/* Configuration ********************************************************************/
/* CONFIG_CAN - Enables CAN support (one or both of CONFIG_STM32_CAN1 or
* CONFIG_STM32_CAN2 must also be defined)
/* CONFIG_CAN - Enables CAN support (MCU-specific selections are also required. For
* STM32, as an example, one or both of CONFIG_STM32_CAN1 or CONFIG_STM32_CAN2
* must also be defined)
* CONFIG_CAN_EXTID - Enables support for the 29-bit extended ID. Default
* Standard 11-bit IDs.
* CONFIG_CAN_FD - Enable support for CAN FD mode. For the upper half driver, this
@@ -794,4 +796,4 @@ int can_txready(FAR struct can_dev_s *dev);
#endif
#endif /* CONFIG_CAN */
#endif /* _INCLUDE_NUTTX_CAN_H */
#endif /* _INCLUDE_NUTTX_DRVERS_CAN_H */
include/nuttx/fs/ioctl.h
+1 -1
View File
@@ -341,7 +341,7 @@
#define _RELAYIOC(nr) _IOC(_RELAYBASE,nr)
/* CAN driver ioctl definitions *********************************************/
/* (see nuttx/can.h */
/* (see nuttx/drivers/can.h */
#define _CANIOCVALID(c) (_IOC_TYPE(c)==_CANBASE)
#define _CANIOC(nr) _IOC(_CANBASE,nr)