Alphabetical order ;) And cosmetic changes (remove duplicated includes)

[proxmark3-svn] / armsrc / LCD.c

diff --git a/armsrc/LCD.c b/armsrc/LCD.c
index 02c2f69624ae405ebc94d26805538c6dceef821b..8e44f7de41d0b34924322bcdb8b6d8c3f06d7a4a 100644 (file)
--- a/armsrc/LCD.c
+++ b/armsrc/LCD.c
@@ -5,10 +5,10 @@
 void LCDSend(unsigned int data)\r
 {\r
        // 9th bit set for data, clear for command\r
 void LCDSend(unsigned int data)\r
 {\r
        // 9th bit set for data, clear for command\r

-       while ((SPI_STATUS & SPI_STATUS_TX_EMPTY) == 0);        // wait for the transfer to complete\r
+       while ((AT91C_BASE_SPI->SPI_SR & AT91C_SPI_TXEMPTY) == 0);      // wait for the transfer to complete\r

        // For clarity's sake we pass data with 9th bit clear and commands with 9th\r
        // bit set since they're implemented as defines, se we need to invert bit\r
        // For clarity's sake we pass data with 9th bit clear and commands with 9th\r
        // bit set since they're implemented as defines, se we need to invert bit\r

-       SPI_TX_DATA = data^0x100;                                                       // Send the data/command\r
+       AT91C_BASE_SPI->SPI_TDR = data^0x100;                                                   // Send the data/command\r

 }\r
 \r
 void LCDSetXY(unsigned char x, unsigned char y)\r
 }\r
 \r
 void LCDSetXY(unsigned char x, unsigned char y)\r


@@ -86,10 +86,10 @@ void LCDReset(void)
 {\r
        LED_A_ON();\r
        SetupSpi(SPI_LCD_MODE);\r
 {\r
        LED_A_ON();\r
        SetupSpi(SPI_LCD_MODE);\r

-       LCD_RESET_LOW();\r
+       LOW(GPIO_LRST);\r

        SpinDelay(100);\r
 \r
        SpinDelay(100);\r
 \r

-       LCD_RESET_HIGH();\r
+       HIGH(GPIO_LRST);\r

        SpinDelay(100);\r
        LED_A_OFF();\r
 }\r
        SpinDelay(100);\r
        LED_A_OFF();\r
 }\r