diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-27 15:39:57 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-27 15:39:57 -0600 |
| commit | ab0dbac1c5db6d0e53609e539686ae1c9024ec63 (patch) | |
| tree | b4d59cddb311db3a285c97332790102a3fd05d62 | |
| parent | 7bda7a5e0cf009da5d0ace3d23efe7a2a2f70dc5 (diff) | |
| download | nuttx-ab0dbac1c5db6d0e53609e539686ae1c9024ec63.tar.gz nuttx-ab0dbac1c5db6d0e53609e539686ae1c9024ec63.tar.bz2 nuttx-ab0dbac1c5db6d0e53609e539686ae1c9024ec63.zip | |
CC3200 Lauchpad updates from Jim Ewing
| -rw-r--r-- | nuttx/configs/cc3200-launchpad/src/cc3200_serial.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/cc3200-launchpad/src/cc3200_utils.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/nuttx/configs/cc3200-launchpad/src/cc3200_serial.c b/nuttx/configs/cc3200-launchpad/src/cc3200_serial.c index 4d7715ab2..6a1359ba1 100644 --- a/nuttx/configs/cc3200-launchpad/src/cc3200_serial.c +++ b/nuttx/configs/cc3200-launchpad/src/cc3200_serial.c @@ -71,7 +71,7 @@ static void cc3200_uart0_init(void) { - HWREG(0x44025048) |= 0x01; + HWREG(0x44025080) |= 0x01; cc3200_pin_type_uart(PIN_55, PIN_MODE_3); cc3200_pin_type_uart(PIN_57, PIN_MODE_3); diff --git a/nuttx/configs/cc3200-launchpad/src/cc3200_utils.c b/nuttx/configs/cc3200-launchpad/src/cc3200_utils.c index 88f7c692a..8534483e9 100644 --- a/nuttx/configs/cc3200-launchpad/src/cc3200_utils.c +++ b/nuttx/configs/cc3200-launchpad/src/cc3200_utils.c @@ -140,19 +140,26 @@ void cc3200_pin_type_uart(uint32_t pin, uint32_t pin_mode) void cc3200_init(void) { + uint8_t x=16; + HWREG(0x4402F064) |= 0x800000; HWREG(0x4402F800 + 0x00000418) |= (1<<4); HWREG(0x4402E16C) |= 0x3C; + HWREG(0x44025000 + 0x00000048) |= 0x00000001; + while(--x) + ; + HWREG(0x44025000 + 0x00000048) &= ~0x00000001; HWREG(0x4402F804) = 0x0; - HWREG(0x4402F804) = 0x0; + HWREG(0x4402F804) = 0x1; if (((HWREG(0x4402F0C8) & 0xFF) == 0x2)) { HWREG(0x4402E110) = ((HWREG(0x4402E110) & ~0xC0F) | 0x2); HWREG(0x4402E114) = ((HWREG(0x4402E110) & ~0xC0F) | 0x2); - HWREG(0x4402E184) |= 0x2; } + HWREG(0x4402E184) |= 0x2; + if ((HWREG(0x4402E0A4) & 0xF) == 0x1) { HWREG(0x4402E0A4) = ((HWREG(0x4402E0A4) & ~0xF)); |