From 9992b23f94532a5d04da91ee8c0844cfcb8dd2e7 Mon Sep 17 00:00:00 2001 From: gdisirio Date: Sat, 9 Mar 2013 11:08:46 +0000 Subject: [PATCH] Fixed bug 3607380. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5387 35acf78f-673a-0410-8e92-d51de3d6d3f4 --- boards/readme.txt | 2 +- demos/ARMCM3-GENERIC-KERNEL/Makefile | 2 +- demos/ARMCM3-STM32F100-DISCOVERY/Makefile | 2 +- demos/ARMCM3-STM32F103-FATFS/Makefile | 2 +- demos/ARMCM3-STM32F103-G++/Makefile | 2 +- demos/ARMCM3-STM32F103/Makefile | 2 +- demos/ARMCM3-STM32F107-FATFS/Makefile | 2 +- os/hal/platforms/SPC560Pxx/xpc560p.h | 5 ++--- readme.txt | 1 + testhal/STM32F1xx/EXT/Makefile | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/boards/readme.txt b/boards/readme.txt index 4a28e12e1..b08a21bfb 100644 --- a/boards/readme.txt +++ b/boards/readme.txt @@ -3,4 +3,4 @@ want to support a new board: - Create a new directory under ./boards, give it the name of your board. - Copy inside the new directory the files from a similar board. - Customize board.c, board.h and board.mk in order to correctly initialize - your board. \ No newline at end of file + your board. diff --git a/demos/ARMCM3-GENERIC-KERNEL/Makefile b/demos/ARMCM3-GENERIC-KERNEL/Makefile index 13e548692..01f24f597 100644 --- a/demos/ARMCM3-GENERIC-KERNEL/Makefile +++ b/demos/ARMCM3-GENERIC-KERNEL/Makefile @@ -69,7 +69,7 @@ LDSCRIPT= $(PORTLD)/STM32F103xB.ld # setting. CSRC = $(PORTSRC) \ $(KERNSRC) \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile index 1438aabd2..a9a5aa9ef 100644 --- a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile +++ b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile @@ -79,7 +79,7 @@ CSRC = $(PORTSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/evtimer.c \ $(CHIBIOS)/os/various/syscalls.c \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/ARMCM3-STM32F103-FATFS/Makefile b/demos/ARMCM3-STM32F103-FATFS/Makefile index 33b6433fb..7c23eee44 100644 --- a/demos/ARMCM3-STM32F103-FATFS/Makefile +++ b/demos/ARMCM3-STM32F103-FATFS/Makefile @@ -82,7 +82,7 @@ CSRC = $(PORTSRC) \ $(CHIBIOS)/os/various/shell.c \ $(CHIBIOS)/os/various/syscalls.c \ $(CHIBIOS)/os/various/chprintf.c \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/ARMCM3-STM32F103-G++/Makefile b/demos/ARMCM3-STM32F103-G++/Makefile index 7fa37b7b0..0556e9719 100644 --- a/demos/ARMCM3-STM32F103-G++/Makefile +++ b/demos/ARMCM3-STM32F103-G++/Makefile @@ -78,7 +78,7 @@ CSRC = $(PORTSRC) \ $(PLATFORMSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/evtimer.c \ - $(CHIBIOS)/os/various/syscalls.c + $(CHIBIOS)/os/various/syscalls.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/ARMCM3-STM32F103/Makefile b/demos/ARMCM3-STM32F103/Makefile index f9c6ec62a..854a84a03 100644 --- a/demos/ARMCM3-STM32F103/Makefile +++ b/demos/ARMCM3-STM32F103/Makefile @@ -79,7 +79,7 @@ CSRC = $(PORTSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/evtimer.c \ $(CHIBIOS)/os/various/syscalls.c \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/demos/ARMCM3-STM32F107-FATFS/Makefile b/demos/ARMCM3-STM32F107-FATFS/Makefile index e3a7d620b..79a34326c 100644 --- a/demos/ARMCM3-STM32F107-FATFS/Makefile +++ b/demos/ARMCM3-STM32F107-FATFS/Makefile @@ -81,7 +81,7 @@ CSRC = $(PORTSRC) \ $(TESTSRC) \ $(CHIBIOS)/os/various/shell.c \ $(CHIBIOS)/os/various/chprintf.c \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting. diff --git a/os/hal/platforms/SPC560Pxx/xpc560p.h b/os/hal/platforms/SPC560Pxx/xpc560p.h index 2703b3c91..76ea503ca 100644 --- a/os/hal/platforms/SPC560Pxx/xpc560p.h +++ b/os/hal/platforms/SPC560Pxx/xpc560p.h @@ -12,9 +12,8 @@ * AUTHOR : B16991 * HISTORY : Changes: typo fixed in PSR1 register:SCP -> CSP, MCR: PRESCALE->BITRATE (b16991) * HISTORY : Changes: typo fixed in ME register MTC bit, SSCM fix, CMU changes(b16991) - * HISTORY : Changes to CTU Module: CR register (LC->FC), CLR changed to 24 bits (b16991) - - * HISTORY : Modified to add reserved space in CTU (b16991) + * HISTORY : Changes to CTU Module: CR register (LC->FC), CLR changed to 24 bits (b16991) + * HISTORY : Modified to add reserved space in CTU (b16991) * HISTORY : Modified to support ADC on Pictus cut 2 - do not distribute! (ttz778) * HISTORY : Modified to support CRC on Pictus cut 2 - do not distribute! (r60321) * HISTORY : Modified to support DSPI0 CS7&8 and new FlexPWM naming on Pictus cut 2 (r60321) diff --git a/readme.txt b/readme.txt index 115824e95..d8272850f 100644 --- a/readme.txt +++ b/readme.txt @@ -86,6 +86,7 @@ ***************************************************************************** *** 2.5.2 *** +- FIX: Fixed surprising non-CRLF lines in source (bug 3607380). - FIX: Fixed misplaced brace in icu_lld.c (bug 3605832)(backported to 2.4.4). - FIX: Fixed errors in MMC_SPI driver state machine (bug 3605794). - FIX: Fixed deadlock in Serial_USB driver (bug 3605793). diff --git a/testhal/STM32F1xx/EXT/Makefile b/testhal/STM32F1xx/EXT/Makefile index 190662d49..e9b6719d7 100644 --- a/testhal/STM32F1xx/EXT/Makefile +++ b/testhal/STM32F1xx/EXT/Makefile @@ -78,7 +78,7 @@ CSRC = $(PORTSRC) \ $(BOARDSRC) \ $(CHIBIOS)/os/various/evtimer.c \ $(CHIBIOS)/os/various/syscalls.c \ - main.c + main.c # C++ sources that can be compiled in ARM or THUMB mode depending on the global # setting.