sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert

Browse Source
This commit is contained in:
Lok Tep 2015-11-09 14:41:08 +01:00
parent 1f8c0fdcdb
commit a8416d2a26
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/include/lpc43xx/chip.h
View File

@ -46,7 +46,7 @@
* Pre-processor Definitions * Pre-processor Definitions
************************************************************************************/ ************************************************************************************/
/* Per the data sheet: LPC4350/30/20/10 Rev. 3.2 4 June 2012 */ /* Per the data sheet: LPC4350/30/20/10 Rev. 3.2 4 June 2012 */
/* Get customizations for each supported chip. /* Get customizations for each supported chip.
* *
* SRAM Resources * SRAM Resources
@ -74,7 +74,7 @@
* manager. This gives some symmetry to all of the members of the family. * manager. This gives some symmetry to all of the members of the family.
*/ */
/* Per the user manual: UM10503, Rev. 1.2 <EFBFBD> 8 June 2012 */ /* Per the user manual: UM10503, Rev. 1.2 — 8 June 2012 */
/* Get customizations for each supported chip. /* Get customizations for each supported chip.
* *
* SRAM Resources * SRAM Resources
@ -632,7 +632,6 @@
# define LPC43_NDAC (1) /* One 10-bit DAC */ # define LPC43_NDAC (1) /* One 10-bit DAC */
# define LPC43_NADC10_CHANNELS (8) /* Eight ADC channels (per ADC)*/ # define LPC43_NADC10_CHANNELS (8) /* Eight ADC channels (per ADC)*/
# define LPC43_NADC12 (1) /* ONne 12-bit ADC controllers (ADCHS)*/ # define LPC43_NADC12 (1) /* ONne 12-bit ADC controllers (ADCHS)*/
>>>>>>> remotes/nuttx/arch/master
#else #else
# error "Unsupported LPC43xx chip" # error "Unsupported LPC43xx chip"
#endif #endif

2
arch/arm/src/lpc43xx/lpc43_usb0dev.c
View File

@ -2847,4 +2847,4 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
g_usbdev.driver = NULL; g_usbdev.driver = NULL;
return OK; return OK;
} }
>>>>>>> remotes/nuttx/arch/master