add -fwhole-program

diff --git a/gcc_c/Makefile b/gcc_c/Makefile
index 65d5f15a90a10147ee8eecb893e06fa57e04f3c5..5b9ade7776487ea2bb702e04cca2c5307b8d9e0b 100644 (file)
--- a/gcc_c/Makefile
+++ b/gcc_c/Makefile
@@ -12,7 +12,7 @@ COMMON = -mmcu=$(MCU)
 \r
 ## Compile options common for all C compilation units.\r
 CFLAGS = $(COMMON)\r
-CFLAGS += -gdwarf-2  -DF_CPU=14745600UL -Os \r
+CFLAGS += -gdwarf-2  -DF_CPU=14745600UL -Os -combine -fwhole-program\r
 CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wa,-adhlns=./$(*F).lst\r
 CFLAGS += -funsigned-char -funsigned-bitfields -fpack-struct -fshort-enums -ffunction-sections\r
 CFLAGS += -MMD -MP -MT $(*F).o -MF .dep/$(@F).d \r

diff --git a/serial_lcd.c b/serial_lcd.c
index dc375fddf158cebe842ac39c929cf63e2ac95863..b611fa1cfe7302ecbc05df35383f73f939c2156b 100644 (file)
--- a/serial_lcd.c
+++ b/serial_lcd.c
@@ -26,12 +26,12 @@
 \r
 #if defined(__GNUC__)\r
 //FUSES = {\r
-// .low = SUT1, \r
+// .low = SUT1,\r
     //  .high = (unsigned char) (DWEN & WDTON & RSTDISBL & BODLEVEL1 & BODLEVEL2),\r
     //  .extended = EFUSE_DEFAULT,\r
     //};\r
 #endif\r
-  \r
+\r
 // Number of PWM brightness levels supported\r
 #define LED_BRIGHTNESS_LEVELS 8\r
 \r
@@ -40,20 +40,20 @@
 #define        LCD_ON  0x0C\r
 // Clear display command\r
 #define LCD_CLR 0x01\r
-// Set 4 data bits \r
-#define LCD_4_Bit 0x20 \r
-// Set 8 data bits \r
-#define LCD_8_Bit 0x30 \r
-// Set number of lines \r
-#define LCD_4_Line 0x08 \r
+// Set 4 data bits\r
+#define LCD_4_Bit 0x20\r
+// Set 8 data bits\r
+#define LCD_8_Bit 0x30\r
+// Set number of lines\r
+#define LCD_4_Line 0x08\r
 // Set 8 data bits\r
 #define        DATA_8  0x30\r
-// Set character font \r
-#define LCD_Font 0x04 \r
-// Turn the cursor on \r
-#define LCD_CURSOR_ON 0x02 \r
-// Turn on cursor blink \r
-#define LCD_CURSOR_BLINK 0x01 \r
+// Set character font\r
+#define LCD_Font 0x04\r
+// Turn the cursor on\r
+#define LCD_CURSOR_ON 0x02\r
+// Turn on cursor blink\r
+#define LCD_CURSOR_BLINK 0x01\r
 \r
 ////// Serial command codes ///////\r
 // ASCII control code to set brightness level\r
@@ -434,12 +434,12 @@ ISR(USART_RX_vect)
     // erroroneous byte received\r
     return;\r
   }\r
-#if HANDLE_DATA_OVER_RUN_ERROR\r
+#ifdef HANDLE_DATA_OVER_RUN_ERROR\r
   if (UCSRA & (1<<DOR)) {\r
     // some applications may benefit from addind error notification for serial port data overruns\r
   }\r
 #endif\r
-  \r
+\r
   rx = UDR;\r
   // Calculate next buffer position.\r
   tmphead = sUartRxHead;\r