diff options
| author | walkerstop <walkerstop@gmail.com> | 2018-05-01 01:00:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 01:00:33 -0700 |
| commit | 40db44f540436398e0840544044154d13eee63b6 (patch) | |
| tree | dad3f1f3b6ac3927484ee22002a947662a8a0173 /testhal/TIVA/TM4C123x/SPI/main.c | |
| parent | 4e9f077fb10255dced1da4d5d2ad9f8ae41442a2 (diff) | |
| parent | d4d384557df0e8e7a8071553448b0c42849f98c0 (diff) | |
| download | ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.gz ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.tar.bz2 ChibiOS-Contrib-40db44f540436398e0840544044154d13eee63b6.zip | |
Merge branch 'master' into master
Diffstat (limited to 'testhal/TIVA/TM4C123x/SPI/main.c')
| -rw-r--r-- | testhal/TIVA/TM4C123x/SPI/main.c | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/testhal/TIVA/TM4C123x/SPI/main.c b/testhal/TIVA/TM4C123x/SPI/main.c index f04cdbf..91cb02a 100644 --- a/testhal/TIVA/TM4C123x/SPI/main.c +++ b/testhal/TIVA/TM4C123x/SPI/main.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2014..2016 Marco Veeneman + Copyright (C) 2014..2017 Marco Veeneman Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ static const SPIConfig hs_spicfg = NULL, GPIOA, 3, - TIVA_CR0_DSS(8) | /*TIVA_CR0_SPH | TIVA_CR_SPO |*/ TIVA_CR0_SRC(0), + SSI_CR0_DSS_8 | /*SSI_CR0_SPH | SSI_CR0_SPO |*/ SSI_CR0_SCR(0), 16 }; @@ -43,7 +43,7 @@ static const SPIConfig ls_spicfg = NULL, GPIOA, 3, - TIVA_CR0_DSS(8) | /*TIVA_CR0_SPH | TIVA_CR_SPO |*/ TIVA_CR0_SRC(0), + SSI_CR0_DSS_8 | /*SSI_CR0_SPH | SSI_CR0_SPO |*/ SSI_CR0_SCR(0), 80 }; @@ -104,15 +104,11 @@ int main(void) halInit(); chSysInit(); - palSetPadMode(GPIOA, GPIOA_SSI0_CLK, PAL_MODE_OUTPUT_PUSHPULL | - PAL_MODE_ALTERNATE(2)); - palSetPadMode(GPIOA, GPIOA_SSI0_RX, PAL_MODE_OUTPUT_PUSHPULL | - PAL_MODE_ALTERNATE(2)); - palSetPadMode(GPIOA, GPIOA_SSI0_TX, PAL_MODE_OUTPUT_PUSHPULL | - PAL_MODE_ALTERNATE(2)); - palSetPadMode(GPIOA, GPIOA_PIN3, PAL_MODE_OUTPUT_PUSHPULL); - - palSetPadMode(GPIOF, GPIOF_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL); + palSetLineMode(LINE_SSI0_CLK, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2)); + palSetLineMode(LINE_SSI0_RX, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2)); + palSetLineMode(LINE_SSI0_TX, PAL_MODE_OUTPUT_PUSHPULL | PAL_MODE_ALTERNATE(2)); + palSetLineMode(LINE_LED_GREEN, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadMode(GPIOA, GPIOA_PIN3, PAL_MODE_OUTPUT_PUSHPULL); /* * Prepare transmit pattern. @@ -124,10 +120,16 @@ int main(void) /* * Starting the transmitter and receiver threads. */ - chThdCreateStatic(spi_thread_1_wa, sizeof(spi_thread_1_wa), - NORMALPRIO + 1, spi_thread_1, NULL); - chThdCreateStatic(spi_thread_2_wa, sizeof(spi_thread_2_wa), - NORMALPRIO + 1, spi_thread_2, NULL); + chThdCreateStatic(spi_thread_1_wa, + sizeof(spi_thread_1_wa), + NORMALPRIO + 1, + spi_thread_1, + NULL); + chThdCreateStatic(spi_thread_2_wa, + sizeof(spi_thread_2_wa), + NORMALPRIO + 1, + spi_thread_2, + NULL); /* * Normal main() thread activity |