OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Changes from review of last PR

This commit is contained in:
Gregory Nutt 2017-05-12 09:04:52 -06:00
parent f981191ac9
commit 7698790be1
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/README.txt
View File

@ -12,10 +12,6 @@ Contents:
Files in this directory Files in this directory
^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^
can/
This is the CAN drivers and logic support. See include/nuttx/can/can.h
for usage information.
dev_null.c and dev_zero.c dev_null.c and dev_zero.c
These files provide the standard /dev/null and /dev/zero devices. These files provide the standard /dev/null and /dev/zero devices.
See include/nuttx/fs/fs.h for functions that should be called if you See include/nuttx/fs/fs.h for functions that should be called if you
@ -55,6 +51,10 @@ bch/
performed by loop.c. See include/nuttx/fs/fs.h for registration performed by loop.c. See include/nuttx/fs/fs.h for registration
information. information.
can/
This is the CAN drivers and logic support. See include/nuttx/can/can.h
for usage information.
contactless/ contactless/
Contactless devices are related to wireless devices. They are not Contactless devices are related to wireless devices. They are not
communication devices with other similar peers, but couplers/interfaces communication devices with other similar peers, but couplers/interfaces

4
drivers/can/Make.defs
View File

@ -1,7 +1,7 @@
############################################################################ ############################################################################
# drivers/can/Make.defs # drivers/can/Make.defs
# #
# Copyright (C) 2016 Gregory Nutt. All rights reserved. # Copyright (C) 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -39,7 +39,7 @@ ifeq ($(CONFIG_CAN),y)
CSRCS += can.c CSRCS += can.c
ifeq ($(CONFIG_MCP2515),y) ifeq ($(CONFIG_CAN_MCP2515),y)
CSRCS += mcp2515.c CSRCS += mcp2515.c
endif endif

4
drivers/can/can.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* drivers/can.c * drivers/can/can.c
* *
* Copyright (C) 2008-2009, 2011-2012, 2014-2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008-2009, 2011-2012, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -57,7 +57,7 @@
#include <nuttx/arch.h> #include <nuttx/arch.h>
#include <nuttx/semaphore.h> #include <nuttx/semaphore.h>
#include <nuttx/fs/fs.h> #include <nuttx/fs/fs.h>
#include <nuttx/drivers/can.h> #include <nuttx/can/can.h>
#ifdef CONFIG_CAN_TXREADY #ifdef CONFIG_CAN_TXREADY
# include <nuttx/wqueue.h> # include <nuttx/wqueue.h>

8
include/nuttx/can/can.h
View File

@ -1,5 +1,5 @@
/************************************************************************************ /************************************************************************************
* include/nuttx/drivers/can.h * include/nuttx/can/can.h
* *
* Copyright (C) 2008, 2009, 2011-2012, 2015-2017 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2009, 2011-2012, 2015-2017 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
@ -33,8 +33,8 @@
* *
************************************************************************************/ ************************************************************************************/
#ifndef __INCLUDE_NUTTX_DRVERS_CAN_H #ifndef __INCLUDE_NUTTX_CAN_CAN_H
#define __INCLUDE_NUTTX_DRVERS_CAN_H #define __INCLUDE_NUTTX_CAN_CAN_H
/************************************************************************************ /************************************************************************************
* Included Files * Included Files
@ -819,4 +819,4 @@ int can_txready(FAR struct can_dev_s *dev);
#endif #endif
#endif /* CONFIG_CAN */ #endif /* CONFIG_CAN */
#endif /* __INCLUDE_NUTTX_DRVERS_CAN_H */ #endif /* __INCLUDE_NUTTX_CAN_CAN_H */