Disabled uart.c ISRs if GDBSTUB (debug emulator) is set

README.md

@@ -28,9 +28,3 @@ libdeps_dir = depends
 In diesem Fall sollte man davon absehen, die automatisch vom PIO 
 heruntergeladenen Bibliotheken ins Git des eigenen Projektes einzuchecken.
 Es empfiehlt sich in dem Fall `depends` ins `.gitignore` einzufügen.
-
-## Interrrupts
-Die UART-Schnittstelle und TWI bzw. I²C arbeiten mit Interrupts. Bei der 
-Initialisierung der jeweiligen (oder auch beiden) Schnittstelle mit 
-[UART_Init()](src/uart.c) bzw. [TWI_Init()](src/twi.c) werden die Interrupts global aktiviert. 
-Die Schnittstellen sind nach der Initialisierung sofort funktionsfähig und können direkt verwendet werden. 

src/dataflash.c

@@ -1,14 +1,11 @@
 #include <avr/io.h>
 #include <stdint.h>
-#include <avr/interrupt.h>
 
 #include "spi.h"
 #include "dataflash.h"
 
-// Prevent Double Initialization
+void
-unsigned short dataflash_flag = 0;
+dataflash_opcode_and_address (unsigned char opcode, unsigned int page, unsigned int offset)
-
-void dataflash_opcode_and_address(unsigned char opcode, unsigned int page, unsigned int offset)
 {
   SPI_MasterTransfer(opcode);
   SPI_MasterTransfer((unsigned char)(page >> 7) & 0x1f);
@@ -16,40 +13,29 @@ void dataflash_opcode_and_address(unsigned char opcode, unsigned int page, unsig
   SPI_MasterTransfer((unsigned char)(offset));
 }
 
-void dataflash_wait(void)
+void
+dataflash_wait (void)
 {
   DATAFLASH_Chip_Select;
   SPI_MasterTransfer(DATAFLASH_STATUS_REGISTER_READ);
   
-  while (!(SPI_MasterTransferRead(0x00) & 0x80))
+  while (!(SPI_MasterTransferRead(0x00) & 0x80));
-    ;
   
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_init(void)
+void
+dataflash_init (void)
 {
-  // Check if already initialized
-  if (!(dataflash_flag & 1))
-  {
-    // Backup Status Register and disable Interrupts
-    uint8_t sreg = SREG;
-    cli();
   // AT45DB081 doesn't actually need an intialization,
   // only the ChipSelect should be configured as an output.
   DDRB |= (1 << PB4);
   DATAFLASH_Chip_Unselect;
   SPI_MasterInit();
-
-    // Restore Status Register
-    SREG = sreg;
-
-    // Set dataflash Init Flag
-    dataflash_flag = 1;
-  }
 }
 
-void dataflash_buffer_to_page(unsigned int page, unsigned char buffer)
+void
+dataflash_buffer_to_page (unsigned int page, unsigned char buffer)
 {
   dataflash_wait();
   DATAFLASH_Chip_Select;
@@ -57,19 +43,22 @@ void dataflash_buffer_to_page(unsigned int page, unsigned char buffer)
   switch (buffer)
     {
     default:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_1_TO_MAIN_MEMORY_PAGE_PROGRAM_WITH_BUILT_IN_ERASE,
+      dataflash_opcode_and_address
+        (DATAFLASH_BUFFER_1_TO_MAIN_MEMORY_PAGE_PROGRAM_WITH_BUILT_IN_ERASE,
          page, 0x00);
       break;
     
     case 2:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_2_TO_MAIN_MEMORY_PAGE_PROGRAM_WITH_BUILT_IN_ERASE,
+      dataflash_opcode_and_address
+        (DATAFLASH_BUFFER_2_TO_MAIN_MEMORY_PAGE_PROGRAM_WITH_BUILT_IN_ERASE,
          page, 0x00);
       break;
     }
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_page_to_buffer(unsigned int page, unsigned char buffer)
+void
+dataflash_page_to_buffer (unsigned int page, unsigned char buffer)
 {
   dataflash_wait();
   DATAFLASH_Chip_Select;
@@ -77,19 +66,22 @@ void dataflash_page_to_buffer(unsigned int page, unsigned char buffer)
   switch (buffer)
     {
     default:
-    dataflash_opcode_and_address(DATAFLASH_MAIN_MEMORY_PAGE_TO_BUFFER_1_TRANSFER,
+      dataflash_opcode_and_address 
+        (DATAFLASH_MAIN_MEMORY_PAGE_TO_BUFFER_1_TRANSFER,
          page, 0x00);
       break;
     
     case 2:
-    dataflash_opcode_and_address(DATAFLASH_MAIN_MEMORY_PAGE_TO_BUFFER_2_TRANSFER,
+      dataflash_opcode_and_address 
+        (DATAFLASH_MAIN_MEMORY_PAGE_TO_BUFFER_2_TRANSFER,
          page, 0x00);
       break;
     }
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_buffer_read(unsigned char buffer, unsigned int offset,
+void
+dataflash_buffer_read (unsigned char buffer, unsigned int offset,
                        unsigned int length, unsigned char *array)
 {
   dataflash_wait();
@@ -98,12 +90,14 @@ void dataflash_buffer_read(unsigned char buffer, unsigned int offset,
   switch (buffer)
     {
     default:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_1_READ_LF,
+      dataflash_opcode_and_address 
+        (DATAFLASH_BUFFER_1_READ_LF,
          0x00, offset);
       break;
     
     case 2:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_2_READ_LF,
+      dataflash_opcode_and_address 
+        (DATAFLASH_BUFFER_2_READ_LF,
          0x00, offset);
       break;
     }
@@ -118,7 +112,8 @@ void dataflash_buffer_read(unsigned char buffer, unsigned int offset,
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_buffer_write(unsigned char buffer, unsigned int offset,
+void
+dataflash_buffer_write (unsigned char buffer, unsigned int offset,
                         unsigned int length, unsigned char *array)
 {
   dataflash_wait();
@@ -127,12 +122,14 @@ void dataflash_buffer_write(unsigned char buffer, unsigned int offset,
   switch (buffer)
     {
     default:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_1_WRITE,
+      dataflash_opcode_and_address 
+        (DATAFLASH_BUFFER_1_WRITE,
          0x00, offset);
       break;
     
     case 2:
-    dataflash_opcode_and_address(DATAFLASH_BUFFER_2_WRITE,
+      dataflash_opcode_and_address 
+        (DATAFLASH_BUFFER_2_WRITE,
          0x00, offset);
       break;
     }
@@ -147,7 +144,8 @@ void dataflash_buffer_write(unsigned char buffer, unsigned int offset,
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_read(unsigned int page, unsigned int offset,
+void
+dataflash_read (unsigned int page, unsigned int offset,
                 unsigned int length, unsigned char *array)
 {
   dataflash_wait();
@@ -165,7 +163,8 @@ void dataflash_read(unsigned int page, unsigned int offset,
   DATAFLASH_Chip_Unselect;
 }
 
-void dataflash_chip_erase(void)
+void
+dataflash_chip_erase (void)
 {
   dataflash_wait();
   DATAFLASH_Chip_Select;

src/fifo.c

@@ -1,29 +1,23 @@
 #include <stdint.h>
 #include "fifo.h"
 
-static uint8_t _fifo_get(fifo_t *f);
+static uint8_t _fifo_get (fifo_t* f);
 
-void fifo_init(fifo_t *f, uint8_t *buffer, const uint8_t size)
+void fifo_init (fifo_t* f, uint8_t* buffer, const uint8_t size)
 {
-  // Backup Status Register and disable Interrupts
-  uint8_t sreg = SREG;
-  cli();
   f->count = 0;
   f->pread = f->pwrite = buffer;
   f->read2end = f->write2end = f->size = size;
-  // Restore Status Register
-  SREG = sreg;
 }
 
-uint8_t fifo_get_wait(fifo_t *f)
+uint8_t fifo_get_wait (fifo_t* f)
 {
-  while (!f->count)
+  while (!f->count);
-    ;
   
   return _fifo_get(f);	
 }
 
-int16_t fifo_get_nowait(fifo_t *f)
+int16_t fifo_get_nowait (fifo_t* f)
 {
   if (!f->count)
     return -1;
@@ -31,12 +25,12 @@ int16_t fifo_get_nowait(fifo_t *f)
   return (int)_fifo_get(f);	
 }
 
-uint8_t fifo_put(fifo_t *f, const uint8_t data)
+uint8_t fifo_put (fifo_t* f, const uint8_t data)
 {
   if (f->count >= f->size)
     return 0;
     
-  uint8_t *pwrite = f->pwrite;
+  uint8_t* pwrite = f->pwrite;
   
   *(pwrite++) = data;
   
@@ -60,9 +54,9 @@ uint8_t fifo_put(fifo_t *f, const uint8_t data)
 }
 
 static uint8_t 
-_fifo_get(fifo_t *f)
+_fifo_get (fifo_t* f)
 {
-  uint8_t *pread = f->pread;
+  uint8_t* pread = f->pread;
   uint8_t data = *(pread++);
   uint8_t read2end = f->read2end;
   

src/lcd.c

@@ -15,29 +15,25 @@ uint8_t lcd_frameupdate = 0;
 uint8_t lcd_textx = 0;
 uint8_t lcd_texty = 0;
 
-// Prevent Double Initialization
+void
-unsigned short LCD_flag = 0;
+LCD_Send (uint8_t data)
-
-void LCD_Send(uint8_t data)
 {
   SPI_MasterTransfer(data);
 }
 
-void LCD_Init(void)
+void
+LCD_Init (void)
 {
-  // Check if already initialized
-  if (!(LCD_flag & 1))
-  {
   SPI_MasterInit();
 
-    // Set Register Select and Chip Select as Output
+  /* Set Register Select and Chip Select as Output */
-    DDRC |= (1 << PC7) | (1 << PC6);
+  DDRC |= (1<<PC7)|(1<<PC6);
   
-    // Backup Status Register and disable Interrupts
+  /* Backup Status Register and disable Interrupts */
   uint8_t sreg = SREG;
   cli();
   
-    // Starting Init Command Sequence
+  /* Starting Init Command Sequence */
   LCD_Command_Mode;
   LCD_Chip_Select;
 
@@ -56,7 +52,7 @@ void LCD_Init(void)
   
   LCD_Clear();
   
-    // Restore Status Register
+  /* Restore Status Register */
   SREG = sreg;
   
   // Initialize TWI for Backlight Control
@@ -65,12 +61,10 @@ void LCD_Init(void)
   
   // Initialize Dataflash
   dataflash_init();
-    // Set UART Init Flag
-    LCD_flag = 1;
-  }
 }
 
-void LCD_Clear(void)
+void
+LCD_Clear (void)
 {
   uint8_t x = 0, y = 0;
   
@@ -83,17 +77,18 @@ void LCD_Clear(void)
   LCD_Update();
 }
 
-void LCD_Update(void)
+void
+LCD_Update (void)
 {
   int8_t page = 7;
   
-  // Backup Status Register and disable Interrupts
+  /* Backup Status Register and disable Interrupts */
   uint8_t sreg = SREG;
   cli();
   
   do
     {
-    if (lcd_frameupdate & (1 << page))
+      if (lcd_frameupdate & (1<<page))
         {
           LCD_Chip_Select;
           LCD_Command_Mode;
@@ -109,15 +104,17 @@ void LCD_Update(void)
           
           LCD_Chip_Unselect;
         }
-  } while (page--);
+    }
+  while (page--);
   
   lcd_frameupdate = 0;
   
-  // Restore Status Register
+  /* Restore Status Register */
   SREG = sreg;
 }
 
-void LCD_DrawPixel(uint8_t x, uint8_t y, uint8_t mode)
+void
+LCD_DrawPixel (uint8_t x, uint8_t y, uint8_t mode)
 {
   // Check if x and y are within display coordinates
   if ((x < 128) && (y < 64))
@@ -148,7 +145,8 @@ void LCD_DrawPixel(uint8_t x, uint8_t y, uint8_t mode)
     }
 }
 
-void LCD_DrawLine(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t mode)
+void
+LCD_DrawLine (uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t mode)
 {
   // look here: http://de.wikipedia.org/wiki/Bresenham-Algorithmus
   int8_t dx = abs(x1 - x0);
@@ -181,7 +179,8 @@ void LCD_DrawLine(uint8_t x0, uint8_t y0, uint8_t x1, uint8_t y1, uint8_t mode)
     }
 }
 
-void LCD_DrawCircle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t mode)
+void
+LCD_DrawCircle (uint8_t x0, uint8_t y0, uint8_t radius, uint8_t mode)
 {
   // look here: http://de.wikipedia.org/wiki/Bresenham-Algorithmus
   int8_t f = 1 - radius;
@@ -219,7 +218,8 @@ void LCD_DrawCircle(uint8_t x0, uint8_t y0, uint8_t radius, uint8_t mode)
     }
 }
 
-void LCD_PutChar(const char c)
+void
+LCD_PutChar (const char c)
 {
   // basic support for cr und new line
   switch (c)
@@ -247,7 +247,8 @@ void LCD_PutChar(const char c)
     }
 }
 
-void LCD_PutString(const char *s)
+void
+LCD_PutString (const char *s)
 {
   // no empty strings allowed!
   if (*s)
@@ -255,15 +256,17 @@ void LCD_PutString(const char *s)
       do
         {
           LCD_PutChar(*s);
-    } while (*(++s));
+        }
+      while (*(++s));
     }
 }
 
-void LCD_PutString_P(PGM_P s)
+void
+LCD_PutString_P (PGM_P s)
 {
-  while (1)
+  while(1)
     {
-    unsigned char c = pgm_read_byte(s);
+      unsigned char c = pgm_read_byte (s);
       s++;
 
       if (c == '\0')
@@ -273,13 +276,15 @@ void LCD_PutString_P(PGM_P s)
     }
 }
 
-void LCD_GotoXY(uint8_t x, uint8_t y)
+void
+LCD_GotoXY (uint8_t x, uint8_t y)
 {
   lcd_textx = x;
   lcd_texty = y;
 }
 
-void LCD_WipeLine(unsigned char line)
+void
+LCD_WipeLine (unsigned char line)
 {
   unsigned char x;
   
@@ -289,7 +294,8 @@ void LCD_WipeLine(unsigned char line)
   lcd_frameupdate |= (1 << line);
 }
 
-void Backlight_Off(void)
+void
+Backlight_Off (void)
 {
   TWI_Start();
   TWI_Address_RW(0xc4);
@@ -302,7 +308,8 @@ void Backlight_Off(void)
   TWI_Stop();
 }
 
-void Backlight_LED(uint8_t led_selector)
+void
+Backlight_LED (uint8_t led_selector)
 {
   TWI_Start();
   TWI_Address_RW(0xc4);
@@ -311,7 +318,8 @@ void Backlight_LED(uint8_t led_selector)
   TWI_Stop();
 }
 
-void Backlight_PWM(uint8_t pwm, uint8_t prescaler, uint8_t value)
+void
+Backlight_PWM (uint8_t pwm, uint8_t prescaler, uint8_t value)
 {
   TWI_Start();
   TWI_Address_RW(0xc4);
@@ -326,7 +334,8 @@ void Backlight_PWM(uint8_t pwm, uint8_t prescaler, uint8_t value)
   TWI_Stop();
 }
 
-void LCD_SavePage(unsigned int page)
+void
+LCD_SavePage (unsigned int page)
 {
   // transfer framebuffer to dataflash using buffer 2
   unsigned char line = 0;
@@ -338,7 +347,8 @@ void LCD_SavePage(unsigned int page)
     }
 }
 
-void LCD_LoadPage(unsigned int page)
+void
+LCD_LoadPage (unsigned int page)
 {
   // transfer dataflash page to framebuffer
   unsigned char line = 0;

src/spi.c

@@ -1,58 +1,50 @@
 #include <avr/io.h>
 #include <stdint.h>
-#include <avr/interrupt.h>
 
 #include "spi.h"
 
 // Prevent Double Initialization
 unsigned short SPI_flag = 0;
 
-void SPI_MasterInit(void)
+void
+SPI_MasterInit (void)
 {
-  // Check if already initialized
+  /* Check if already initialized */
   if (!(SPI_flag & 1))
     {
-    // Backup Status Register and disable Interrupts
+      /* Set MOSI and SCK output */
-    uint8_t sreg = SREG;
+      DDRB |= (1<<PB5)|(1<<PB7);
-    cli();
       
-    // Set MOSI, SCK and SS output
+      /* Enable SPI, Master */
-    DDRB |= (1 << PB5) | (1 << PB7) | (1 << PB4);
+      SPCR = (1<<SPE)|(1<<MSTR);
       
-    // Enable SPI, Master
+      /* Set Double SPI Speed Bit, SPI clock will be fck/2 */
-    SPCR = (1 << SPE) | (1 << MSTR);
+      SPSR = (1<<SPI2X);
       
-    // Set Double SPI Speed Bit, SPI clock will be fck/2
+      /* Set SPI Init Flag */
-    SPSR = (1 << SPI2X);
-
-    // Restore Status Register
-    SREG = sreg;
-
-    // Set SPI Init Flag
       SPI_flag = 1;
     }
 }
 
-void SPI_MasterTransfer(unsigned char c)
+void
+SPI_MasterTransfer (unsigned char c)
 {
-  // Start transmission
+  /* Start transmission */
   SPDR = c;
   
-  // Wait for transmission complete
+  /* Wait for transmission complete */
-  while (!(SPSR & (1 << SPIF)))
+  while (!(SPSR & (1<<SPIF)));
-    ;
 }
 
 unsigned char
-SPI_MasterTransferRead(unsigned char c)
+SPI_MasterTransferRead (unsigned char c)
 {
-  // Start transmission
+  /* Start transmission */
   SPDR = c;
   
-  // Wait for transmission complete
+  /* Wait for transmission complete */
-  while (!(SPSR & (1 << SPIF)))
+  while (!(SPSR & (1<<SPIF)));
-    ;
   
-  // Return incoming character
+  /* Return incoming character */
   return SPDR;
 }

src/twi.c

@@ -6,20 +6,12 @@
 
 volatile uint8_t twi_timeout = 0x00;
 
-// Prevent Double Initialization
+void
-unsigned short TWI_flag = 0;
+TWI_Init (void)
-
-void TWI_Init(void)
 {
-  // Check if already initialized
-  if (!(TWI_flag & 1))
-  {
-    //disable global interrupts
-    cli();
-
   // Port Setup
-    DDRC &= ~((1 << PC0) | (1 << PC1));
+  DDRC &= ~((1 << PC0)|(1 << PC1));
-    PORTC |= (1 << PC0) | (1 << PC1);
+  PORTC |= (1 << PC0)|(1 << PC1);
   
   // Setup TWI Speed to 400kHZ (TWPS = 1)
   TWBR = 3;
@@ -30,70 +22,64 @@ void TWI_Init(void)
   
   OCR2A = 125;
   
-    // Set TWI Init Flag
-    TWI_flag = 1;
-
   // Interrupts REQUIRED!
   sei();
-  }
 }
 
 int16_t
-TWI_Start(void)
+TWI_Start (void)
 {
   twi_timeout = 10;
   
-  TWCR = (1 << TWINT) | (1 << TWSTA) | (1 << TWEN);
+  TWCR = (1 << TWINT)|(1 << TWSTA)|(1 << TWEN);
-  while ((twi_timeout) && (!(TWCR & (1 << TWINT))))
+  while ((twi_timeout) && (!(TWCR & (1 << TWINT))));
-    ;
   
   if (twi_timeout)
-    return (int16_t)(TWSR & 0xf8);
+    return (int16_t) (TWSR & 0xf8);
   else
     return -1;
 }
 
 int16_t
-TWI_Address_RW(uint8_t address)
+TWI_Address_RW (uint8_t address)
 {
   twi_timeout = 10;
   
   TWDR = address;
-  TWCR = (1 << TWINT) | (1 << TWEN);
+  TWCR = (1 << TWINT)|(1 << TWEN);
-  while ((twi_timeout) && (!(TWCR & (1 << TWINT))))
+  while ((twi_timeout) && (!(TWCR & (1 << TWINT))));
-    ;
   
   if (twi_timeout)
-    return (int16_t)(TWSR & 0xf8);
+    return (int16_t) (TWSR & 0xf8);
   else
     return -1;
 }
 
 int16_t
-TWI_Write(uint8_t data)
+TWI_Write (uint8_t data)
 {
   twi_timeout = 10;
   
   TWDR = data;
-  TWCR = (1 << TWINT) | (1 << TWEN);
+  TWCR = (1 << TWINT)|(1 << TWEN);
-  while ((twi_timeout) && (!(TWCR & (1 << TWINT))))
+  while ((twi_timeout) && (!(TWCR & (1 << TWINT))));
-    ;
   
   if (twi_timeout)
-    return (int16_t)(TWSR & 0xf8);
+    return (int16_t) (TWSR & 0xf8);
   else
     return -1;
 }
 
-void TWI_Stop(void)
+void
+TWI_Stop (void)
 {
   twi_timeout = 10;
   
-  TWCR = (1 << TWINT) | (1 << TWEN) | (1 << TWSTO);
+  TWCR = (1 << TWINT)|(1 << TWEN)|(1 << TWSTO);
 }
 
 // ISR will be called every 8ms to decrease twi_timeout if > 0
-ISR(TIMER2_COMPA_vect)
+ISR (TIMER2_COMPA_vect)
 {
   OCR2A += 125;
 

src/uart.c

@@ -16,16 +16,11 @@ uint8_t uart_outbuf[UART_BUFSIZE_OUT];
 fifo_t uart_infifo;
 fifo_t uart_outfifo;
 
-// Prevent Double Initialization
-unsigned short UART_flag = 0;
-
 void
 UART_Init (void)
 {
-  // Check if already initialized
+  // Save Status Register and disable Interrupts
-  if (!(UART_flag & 1))
+  uint8_t sreg = SREG;
-  {
-  //disable Interrupts
   cli();
   
   // Set Baudrate according to datasheet (16MHz -> 9600 Baud -> 103)
@@ -37,16 +32,12 @@ UART_Init (void)
   // Reset Complete-Flags
   UCSR0A = (1 << RXC0)|(1 << TXC0);
   
-  // Interrupts REQUIRED!
+  // Reset Status Register
-  sei();
+  SREG = sreg;
   
   // Initialize FIFO Buffers
   fifo_init(&uart_infifo, uart_inbuf, UART_BUFSIZE_IN);
   fifo_init(&uart_outfifo, uart_outbuf, UART_BUFSIZE_OUT);
-
-  // Set UART Init Flag
-  UART_flag = 1;
-  }
 }
 
 int8_t
@@ -64,6 +55,8 @@ UART_PutChar (const uint8_t c)
   return ret;
 }
 
+#ifndef GDBSTUB
+
 // Receive Interrupt Routine
 ISR(USART0_RX_vect)
 {
@@ -79,6 +72,8 @@ ISR(USART0_UDRE_vect)
     UCSR0B &= ~(1 << UDRIE0);
 }
 
+#endif
+
 int16_t
 UART_GetChar (void)
 {