diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-29 23:25:29 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-06-29 23:25:29 +0000 |
commit | b4e5a619145f855910f80cd469a76f5e7131febe (patch) | |
tree | a2f12de63d0a8819debc6557020e17d5805932fa /c | |
parent | 2009-06-29 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
download | rtems-b4e5a619145f855910f80cd469a76f5e7131febe.tar.bz2 |
2009-06-29 Xi Yang <hiyangxi@gmail.com>
* pxa255/ffuart/ffuart.c, pxa255/include/pxa255.h: Add Skyeye support.
* pxa255/include/bits.h: Removed.
Diffstat (limited to 'c')
-rw-r--r-- | c/src/lib/libcpu/arm/ChangeLog | 5 | ||||
-rwxr-xr-x | c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c | 4 | ||||
-rwxr-xr-x | c/src/lib/libcpu/arm/pxa255/include/bits.h | 50 | ||||
-rwxr-xr-x | c/src/lib/libcpu/arm/pxa255/include/pxa255.h | 3 |
4 files changed, 9 insertions, 53 deletions
diff --git a/c/src/lib/libcpu/arm/ChangeLog b/c/src/lib/libcpu/arm/ChangeLog index 40d2f5735b..f8939506f2 100644 --- a/c/src/lib/libcpu/arm/ChangeLog +++ b/c/src/lib/libcpu/arm/ChangeLog @@ -1,3 +1,8 @@ +2009-06-29 Xi Yang <hiyangxi@gmail.com> + + * pxa255/ffuart/ffuart.c, pxa255/include/pxa255.h: Add Skyeye support. + * pxa255/include/bits.h: Removed. + 2009-06-05 Joel Sherrill <joel.sherrill@OARcorp.com> * preinstall.am, pxa255/clock/clock.c, pxa255/ffuart/ffuart.c, diff --git a/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c b/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c index 7df7aaf6c2..b91cb674fd 100755 --- a/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c +++ b/c/src/lib/libcpu/arm/pxa255/ffuart/ffuart.c @@ -20,6 +20,7 @@ #include <libchip/sersupp.h> volatile int dbg_dly; +void _start(void); /* static function prototypes */ static int ffuart_first_open(int major, int minor, void *arg); @@ -126,6 +127,7 @@ static int ffuart_write(int minor, const char *buf, int len) } c = (char) buf[i]; +#if ON_SKYEYE != 1 if(c=='\n'){ ffuart->rbr = '\r'; for (x = 0; x < 100; x++) { @@ -136,8 +138,8 @@ static int ffuart_write(int minor, const char *buf, int len) break; } } - ffuart->rbr = c; } +#endif ffuart->rbr = c; /* the TXRDY flag does not seem to update right away (is this true?) */ diff --git a/c/src/lib/libcpu/arm/pxa255/include/bits.h b/c/src/lib/libcpu/arm/pxa255/include/bits.h deleted file mode 100755 index f16eaec61b..0000000000 --- a/c/src/lib/libcpu/arm/pxa255/include/bits.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Bit position definitions - * - * Copyright (c) 2002 by Cogent Computer Systems - * Written by Mike Kelly <mike@cogcomp.com> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ -#ifndef __BITS_H__ -#define __BITS_H__ - -#define BIT0 0x00000001 -#define BIT1 0x00000002 -#define BIT2 0x00000004 -#define BIT3 0x00000008 -#define BIT4 0x00000010 -#define BIT5 0x00000020 -#define BIT6 0x00000040 -#define BIT7 0x00000080 -#define BIT8 0x00000100 -#define BIT9 0x00000200 -#define BIT10 0x00000400 -#define BIT11 0x00000800 -#define BIT12 0x00001000 -#define BIT13 0x00002000 -#define BIT14 0x00004000 -#define BIT15 0x00008000 -#define BIT16 0x00010000 -#define BIT17 0x00020000 -#define BIT18 0x00040000 -#define BIT19 0x00080000 -#define BIT20 0x00100000 -#define BIT21 0x00200000 -#define BIT22 0x00400000 -#define BIT23 0x00800000 -#define BIT24 0x01000000 -#define BIT25 0x02000000 -#define BIT26 0x04000000 -#define BIT27 0x08000000 -#define BIT28 0x10000000 -#define BIT29 0x20000000 -#define BIT30 0x40000000 -#define BIT31 0x80000000 - -#endif /* __BITS_H__ */ - diff --git a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h b/c/src/lib/libcpu/arm/pxa255/include/pxa255.h index 4d75bba1b2..1d0018aca1 100755 --- a/c/src/lib/libcpu/arm/pxa255/include/pxa255.h +++ b/c/src/lib/libcpu/arm/pxa255/include/pxa255.h @@ -86,8 +86,7 @@ typedef unsigned int word_t; #define FFUART_BASE 0x40100000 -/*Write the MAGIC_NUMBER to the MAGIC_ADDRESS then the Skyeye will exit, - we can use this function to automatic test the RTEMS bsp */ +/*Write to KSYEYE_MAGIC_ADDRESS makes SKYEYE to exits*/ #define SKYEYE_MAGIC_ADDRESS (*(volatile word_t *)(0xb0000000)) #define SKYEYE_MAGIC_NUMBER (0xf0f0f0f0) |