giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some code style problems

This commit is contained in:
Jinyan BAI 2018-09-11 15:23:34 +01:00
parent 3ece31be30
commit 46eca2ee25
8 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/cpu/cc26xx-cc13xx/Makefile.cc26xx-cc13xx
View File

@ -1,6 +1,12 @@
CPU_ABS_PATH = arch/cpu/cc26xx-cc13xx CPU_ABS_PATH = arch/cpu/cc26xx-cc13xx
TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH) TI_XXWARE = $(CONTIKI_CPU)/$(TI_XXWARE_PATH)
ifeq (,$(wildcard $(TI_XXWARE)))
$(warning $(TI_XXWARE) does not exist.)
$(warning Did you run 'git submodule update --init' ?)
$(error "")
endif
### cc26xxware / cc26x0r2fware sources under driverlib will be added to the ### cc26xxware / cc26x0r2fware sources under driverlib will be added to the
### MODULES list ### MODULES list
TI_XXWARE_SRC = $(CPU_ABS_PATH)/$(TI_XXWARE_PATH)/driverlib TI_XXWARE_SRC = $(CPU_ABS_PATH)/$(TI_XXWARE_PATH)/driverlib

4
arch/cpu/cc26xx-cc13xx/lpm.c
View File

@ -193,8 +193,12 @@ wake_up(void)
ti_lib_sys_ctrl_aon_sync(); ti_lib_sys_ctrl_aon_sync();
/* Adjust recharge settings */ /* Adjust recharge settings */
#ifdef ThisLibraryIsFor_CC26x0R2_HaltIfViolated
// May need to change to XOSC_IN_LOW_POWER_MODE // May need to change to XOSC_IN_LOW_POWER_MODE
ti_lib_sys_ctrl_adjust_recharge_after_power_down(XOSC_IN_HIGH_POWER_MODE); ti_lib_sys_ctrl_adjust_recharge_after_power_down(XOSC_IN_HIGH_POWER_MODE);
#else
ti_lib_sys_ctrl_adjust_recharge_after_power_down();
#endif
/* /*
* Release the request to the uLDO * Release the request to the uLDO

6
arch/platform/srf06-cc26xx/launchpad/cc2640r2/board.h
View File

@ -31,9 +31,9 @@
/** \addtogroup launchpad-peripherals /** \addtogroup launchpad-peripherals
* @{ * @{
* *
* \defgroup launchpad-cc26xx-specific CC2650 LaunchPad Peripherals * \defgroup launchpad-cc2640r2-specific CC2640R2 LaunchPad Peripherals
* *
* Defines related to the CC2650 LaunchPad * Defines related to the CC2640R2 LaunchPad
* *
* This file provides connectivity information on LEDs, Buttons, UART and * This file provides connectivity information on LEDs, Buttons, UART and
* other peripherals * other peripherals
@ -43,7 +43,7 @@
* *
* \file * \file
* Header file with definitions related to the I/O connections on the TI * Header file with definitions related to the I/O connections on the TI
* CC2650 LaunchPad * CC2640R2 LaunchPad
* *
* \note Do not include this file directly. It gets included by contiki-conf * \note Do not include this file directly. It gets included by contiki-conf
* after all relevant directives have been set. * after all relevant directives have been set.