Changeset 348 for trunk/softs/tsar_boot/src

Timestamp:

Apr 2, 2013, 2:23:02 PM (12 years ago)

Author:

cfuguet

Message:

Adding the boot_putc and the boot_getc in the functions
pointer table defined at the beginning of the reset code

Location:

trunk/softs/tsar_boot/src

Files:

• boot_tty.c (modified) (2 diffs)
• reset.S (modified) (2 diffs)

trunk/softs/tsar_boot/src/boot_tty.c

@@ -2 +2 @@
 #include <defs.h>
 
-int boot_getc(int *c)
+int boot_getc(char *c)
 {
-        unsigned int* tty_address = (unsigned int*) TTY_BASE;
-        if (ioread32(&tty_address[TTY_STATUS]) == 0)
-                return 0;
+    unsigned int* tty_address = (unsigned int*) TTY_BASE;
+    if (ioread32(&tty_address[TTY_STATUS]) == 0)
+        return 0;
 
-        *c = ioread32(&tty_address[TTY_READ]);
-        return 1;
+    *c = ioread32(&tty_address[TTY_READ]);
+    return 1;
 }
 
@@ -25 +25 @@
     {
         if (buffer[n] == 0) break;
-        boot_putc(buffer[n]);
+        boot_putc(buffer[n]);
     }
 } 

trunk/softs/tsar_boot/src/reset.S

@@ -29 +29 @@
     .extern seg_stack_base
 
+    .extern dtb_addr
     .extern boot_ioc_init
     .extern boot_putc
     .extern boot_getc
     .extern boot_puts
+    .extern boot_putx
     .extern boot_ioc_read
     .extern boot_elf_loader
     .extern boot_memcpy
-    .extern dtb_addr
 
     .globl  boot                    /* Make reset an external symbol */
@@ -52 +53 @@
     .word   BOOT_VERSION            /* 0xbfc0008 */
     .word   dtb_addr                /* 0xbfc000c */
-    .word   boot_putc               /* 0xbfc0010 */
-    .word   boot_getc               /* 0xbfc0014 */
+    .word   boot_getc               /* 0xbfc0010 */
+    .word   boot_putc               /* 0xbfc0014 */
     .word   boot_puts               /* 0xbfc0018 */
-    .word   boot_ioc_read           /* 0xbfc001C */
-    .word   boot_elf_loader         /* 0xbfc0020 */
-    .word   boot_memcpy             /* 0xbfc0024 */
+    .word   boot_putx               /* 0xbfc001C */
+    .word   boot_putd               /* 0xbfc0020 */
+    .word   boot_ioc_read           /* 0xbfc0024 */
+    .word   boot_elf_loader         /* 0xbfc0028 */
+    .word   boot_memcpy             /* 0xbfc002C */
 
 _boot: