diff options
Diffstat (limited to 'drivers/avr')
-rw-r--r-- | drivers/avr/serial.c | 6 | ||||
-rw-r--r-- | drivers/avr/spi_master.c | 2 | ||||
-rw-r--r-- | drivers/avr/spi_master.h | 2 | ||||
-rw-r--r-- | drivers/avr/uart.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/avr/serial.c b/drivers/avr/serial.c index 526a0946b..3647bee0d 100644 --- a/drivers/avr/serial.c +++ b/drivers/avr/serial.c | |||
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | #ifdef SOFT_SERIAL_PIN | 21 | #ifdef SOFT_SERIAL_PIN |
22 | 22 | ||
23 | # if !(defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) | 23 | # if !(defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)) |
24 | # error serial.c is not supported for the currently selected MCU | 24 | # error serial.c is not supported for the currently selected MCU |
25 | # endif | 25 | # endif |
26 | // if using ATmega32U4/2, AT90USBxxx I2C, can not use PD0 and PD1 in soft serial. | 26 | // if using ATmega32U4/2, AT90USBxxx I2C, can not use PD0 and PD1 in soft serial. |
@@ -52,8 +52,8 @@ | |||
52 | # define EICRx EICRA | 52 | # define EICRx EICRA |
53 | # endif | 53 | # endif |
54 | 54 | ||
55 | // ATmegaxxU2 specific config | 55 | // ATmegaxxU2/AT90USB162 specific config |
56 | # if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) | 56 | # if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_AT90USB162__) |
57 | // PD4(INT5), PD6(INT6), PD7(INT7), PC7(INT4) | 57 | // PD4(INT5), PD6(INT6), PD7(INT7), PC7(INT4) |
58 | # if SOFT_SERIAL_PIN == D4 | 58 | # if SOFT_SERIAL_PIN == D4 |
59 | # define EIMSK_BIT _BV(INT5) | 59 | # define EIMSK_BIT _BV(INT5) |
diff --git a/drivers/avr/spi_master.c b/drivers/avr/spi_master.c index cbec9f36e..19ca0ced4 100644 --- a/drivers/avr/spi_master.c +++ b/drivers/avr/spi_master.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include "quantum.h" | 20 | #include "quantum.h" |
21 | #include "timer.h" | 21 | #include "timer.h" |
22 | 22 | ||
23 | #if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) | 23 | #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) |
24 | # define SPI_SCK_PIN B1 | 24 | # define SPI_SCK_PIN B1 |
25 | # define SPI_MOSI_PIN B2 | 25 | # define SPI_MOSI_PIN B2 |
26 | # define SPI_MISO_PIN B3 | 26 | # define SPI_MISO_PIN B3 |
diff --git a/drivers/avr/spi_master.h b/drivers/avr/spi_master.h index e36a7c21c..9203698dd 100644 --- a/drivers/avr/spi_master.h +++ b/drivers/avr/spi_master.h | |||
@@ -21,7 +21,7 @@ | |||
21 | typedef int16_t spi_status_t; | 21 | typedef int16_t spi_status_t; |
22 | 22 | ||
23 | // Hardware SS pin is defined in the header so that user code can refer to it | 23 | // Hardware SS pin is defined in the header so that user code can refer to it |
24 | #if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) | 24 | #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) |
25 | # define SPI_SS_PIN B0 | 25 | # define SPI_SS_PIN B0 |
26 | #elif defined(__AVR_ATmega32A__) | 26 | #elif defined(__AVR_ATmega32A__) |
27 | # define SPI_SS_PIN B4 | 27 | # define SPI_SS_PIN B4 |
diff --git a/drivers/avr/uart.c b/drivers/avr/uart.c index e866a9e4f..c6abcb6fe 100644 --- a/drivers/avr/uart.c +++ b/drivers/avr/uart.c | |||
@@ -29,7 +29,7 @@ | |||
29 | 29 | ||
30 | #include "uart.h" | 30 | #include "uart.h" |
31 | 31 | ||
32 | #if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) | 32 | #if defined(__AVR_AT90USB162__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) |
33 | # define UDRn UDR1 | 33 | # define UDRn UDR1 |
34 | # define UBRRnL UBRR1L | 34 | # define UBRRnL UBRR1L |
35 | # define UCSRnA UCSR1A | 35 | # define UCSRnA UCSR1A |