diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:56:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-06-26 10:56:16 +0200 |
| commit | a11f778d76d96463fd8ae9e992afea98a1523a97 (patch) | |
| tree | 02b896a174d23b53089062ed468277f18c6b588d /board/trab/trab.c | |
| parent | f0e3d2b42268a9ed8d28c50c662eeba08379ceab (diff) | |
| parent | a63c31cff5147f1eca19d884ee120005775fbffc (diff) | |
| download | u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.zip u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.tar.gz u-boot-imx-a11f778d76d96463fd8ae9e992afea98a1523a97.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'board/trab/trab.c')
| -rw-r--r-- | board/trab/trab.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/board/trab/trab.c b/board/trab/trab.c index 346406e..26e52d2 100644 --- a/board/trab/trab.c +++ b/board/trab/trab.c @@ -152,13 +152,13 @@ int dram_init (void) #define KBD_DATA (((*(volatile ulong *)0x04020000) >> 16) & 0xF) -static uchar *key_match (ulong); +static char *key_match (ulong); int misc_init_r (void) { ulong kbd_data = KBD_DATA; - uchar keybd_env[KEYBD_KEY_NUM + 1]; - uchar *str; + char *str; + char keybd_env[KEYBD_KEY_NUM + 1]; int i; #ifdef CONFIG_VERSION_VARIABLE @@ -208,7 +208,7 @@ int misc_init_r (void) static uchar kbd_magic_prefix[] = "key_magic"; static uchar kbd_command_prefix[] = "key_cmd"; -static int compare_magic (ulong kbd_data, uchar *str) +static int compare_magic (ulong kbd_data, char *str) { uchar key_mask; @@ -254,12 +254,12 @@ static int compare_magic (ulong kbd_data, uchar *str) * Note: the string points to static environment data and must be * saved before you call any function that modifies the environment. */ -static uchar *key_match (ulong kbd_data) +static char *key_match (ulong kbd_data) { - uchar magic[sizeof (kbd_magic_prefix) + 1]; - uchar cmd_name[sizeof (kbd_command_prefix) + 1]; - uchar *suffix; - uchar *kbd_magic_keys; + char magic[sizeof (kbd_magic_prefix) + 1]; + char cmd_name[sizeof (kbd_command_prefix) + 1]; + char *suffix; + char *kbd_magic_keys; /* * The following string defines the characters that can pe appended @@ -304,7 +304,7 @@ static uchar *key_match (ulong kbd_data) int do_kbd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { ulong kbd_data = KBD_DATA; - uchar keybd_env[KEYBD_KEY_NUM + 1]; + char keybd_env[KEYBD_KEY_NUM + 1]; int i; puts ("Keys:"); @@ -404,7 +404,7 @@ static void tsc2000_write(unsigned int page, unsigned int reg, static void tsc2000_set_brightness(void) { - uchar tmp[10]; + char tmp[10]; int i, br; spi_init(); |