Changeset 368

Timestamp:

Apr 16, 2013, 5:33:46 PM (12 years ago)

Author:

cfuguet

Message:

Modification in tsar/trunk/softs/tsar_boot

Writing the carriage return ('\r')character whenever the
line feed character ('\n') is written on the tty.
This modification has been implemented in the boot_putc
function.

Relocating the ldscript of the tsar_boot into each platform
conf directory.

Location:

trunk/softs/tsar_boot

Files:

• Makefile (modified) (1 diff)
• conf/ldscript (deleted)
• conf/platform_fpga_de2-115/ldscript (added)
• conf/platform_vgsb_xicu_mmu/ldscript (added)
• src/boot_tty.c (modified) (3 diffs)

trunk/softs/tsar_boot/Makefile

@@ -70 +70 @@
 all: $(TARGET)
 
-$(TARGET): $(BUILD_DIR) $(OBJS) conf/ldscript $(BUILD_DIR)/platform.ld
+$(TARGET): $(BUILD_DIR) $(OBJS) $(PLATFORM_DIR)/ldscript $(BUILD_DIR)/platform.ld
         $(ECHO) "[   LD   ]     $@"
-        $(LD) -o $@ -T conf/ldscript $(OBJS)
+        $(LD) -o $@ -T $(PLATFORM_DIR)/ldscript $(OBJS)
         $(DU) -D $@ > $@.txt
 

trunk/softs/tsar_boot/src/boot_tty.c

@@ -14 +14 @@
 void boot_putc(const char c)
 {
-        unsigned int* tty_address = (unsigned int*) TTY_BASE;
-        iowrite32(&tty_address[TTY_WRITE], (unsigned int)c);
+    unsigned int* tty_address = (unsigned int*) TTY_BASE;
+    iowrite32(&tty_address[TTY_WRITE], (unsigned int)c);
+
+    if (c == '\n')
+    {
+        iowrite32(&tty_address[TTY_WRITE], (unsigned int)'\r');
+    }
 }
 
@@ -25 +30 @@
     {
         if (buffer[n] == 0) break;
+
         boot_putc(buffer[n]);
     }
@@ -74 +80 @@
 void boot_exit()
 {
-    static const char exit_str[] = "\n\r!!! Exit Processor ";
-    static const char eol_str[] = " !!!\n\r";
-
     register int pid;
     asm volatile( "mfc0 %0, $15, 1": "=r"(pid) );
 
-    boot_puts(exit_str);
+    boot_puts("\n!!! Exit Processor ");
     boot_putx(pid);
-    boot_puts(eol_str);
+    boot_puts(" !!!\n");
 
     while(1) asm volatile("nop");   // infinite loop...