RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* include/bsp.h: Rename poorly named define "M" to "JOEL_M" since
	I can't find it used anywhere.  When code breaks, someone will
	suggest a better name.  But "M" conflicted with user code.
	* start/start.S: Verify boot_card() is passed a NULL.
This commit is contained in:
Joel Sherrill
2010-04-07 21:49:20 +00:00
parent 09d053e821
commit c187b50a89
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/lib/libbsp/arm/rtl22xx/ChangeLog
View File

@@ -1,3 +1,10 @@
2010-04-07 Joel Sherrill <joel.sherrill@oarcorp.com>
* include/bsp.h: Rename poorly named define "M" to "JOEL_M" since
I can't find it used anywhere. When code breaks, someone will
suggest a better name. But "M" conflicted with user code.
* start/start.S: Verify boot_card() is passed a NULL.
2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org> 2009-10-21 Ralf Corsépius <ralf.corsepius@rtems.org>
* make/custom/rtl22xx.cfg: Remove RTEMS_BSP_FAMILY. * make/custom/rtl22xx.cfg: Remove RTEMS_BSP_FAMILY.

6
c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
View File

@@ -85,7 +85,11 @@ extern "C" {
#define Fcclk (Fosc << 2) //system freq 2^n time of Fosc(1~32) <=60MHZ #define Fcclk (Fosc << 2) //system freq 2^n time of Fosc(1~32) <=60MHZ
#define Fcco (Fcclk <<2) //CCO freq 2,4,8,16 time of Fcclk 156MHz~320MHz #define Fcco (Fcclk <<2) //CCO freq 2,4,8,16 time of Fcclk 156MHz~320MHz
#define Fpclk (Fcclk >>2) * 1 //VPB freq only(Fcclk / 4) 1~4 #define Fpclk (Fcclk >>2) * 1 //VPB freq only(Fcclk / 4) 1~4
#define M Fcclk / Fosc /* This was M. That is a BAD BAD public constant. I renamed it to
* JOEL_M so it wouldn't conflict with user code. If you can find
* a better name, fix this. But nothing I found uses it.
*/
#define JOEL_M Fcclk / Fosc
#define P_min Fcco_MIN / (2*Fcclk) + 1; #define P_min Fcco_MIN / (2*Fcclk) + 1;
#define P_max Fcco_MAX / (2*Fcclk); #define P_max Fcco_MAX / (2*Fcclk);

8
c/src/lib/libbsp/arm/rtl22xx/start/start.S
View File

@@ -12,11 +12,6 @@
* $Id$ * $Id$
*/ */
#warning Call to boot_card has changed and needs checking.
#warning The call is "void boot_card(const char* cmdline);"
#warning You need to pass a NULL.
#warning Please check and remove these warnings.
/* Some standard definitions...*/ /* Some standard definitions...*/
/* Some standard definitions...*/ /* Some standard definitions...*/
@@ -104,8 +99,9 @@ _bss_init:
blo _bss_init /* loop while r0 < r1 */ blo _bss_init /* loop while r0 < r1 */
#ifdef __thumb__
/* Now we are prepared to start the BSP's C code */ /* Now we are prepared to start the BSP's C code */
mov r0, #0
#ifdef __thumb__
ldr r3, =boot_card ldr r3, =boot_card
bx r3 bx r3
#else #else