Changeset fbe058f in mainline

Timestamp:

2005-12-12T17:40:29Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6ed8b3a

Parents:

e07fe0c

Message:

Cleanup of unnecessary things.

Location:

arch/mips32

Files:

• include/cp0.h (modified) (1 diff)
• src/cpu/cpu.c (modified) (1 diff)
• src/drivers/arc.c (modified) (2 diffs)
• src/exception.c (modified) (1 diff)
• src/interrupt.c (modified) (1 diff)

arch/mips32/include/cp0.h

@@ -81 +81 @@
 extern __u32 cp0_badvaddr_read(void);
 
-extern volatile __u32 cp0_count_read(void);
+extern __u32 cp0_count_read(void);
 extern void cp0_count_write(__u32 val);
 
-extern volatile __u32 cp0_entry_hi_read(void);
+extern __u32 cp0_entry_hi_read(void);
 extern void cp0_entry_hi_write(__u32 val);
 
-extern volatile __u32 cp0_compare_read(void);
+extern __u32 cp0_compare_read(void);
 extern void cp0_compare_write(__u32 val);
 

arch/mips32/src/cpu/cpu.c

@@ -109 +109 @@
                 for (i=0;imp_data80[i].vendor;i++)
                         ;
-                if (m->arch.imp_num & 0x7f >= i) {
+                if ((m->arch.imp_num & 0x7f) >= i) {
                         printf("imp=%d\n",m->arch.imp_num);
                         return;

arch/mips32/src/drivers/arc.c

@@ -218 +218 @@
 }
 
+static char arc_read(chardev_t *dev)
+{
+        char ch;
+        __u32 count;
+        long result;
+
+        result = arc_entry->read(0, &ch, 1, &count);
+        if (result || count!=1) {
+                printf("Error reading from ARC keyboard.\n");
+                cpu_halt();
+        }
+        if (ch == '\r')
+                return '\n';
+        if (ch == 0x7f)
+                return '\b';
+        return ch;
+}
+
 static void arc_write(chardev_t *dev, const char ch)
 {
@@ -236 +254 @@
         .resume = arc_enable,
         .suspend = arc_disable,
-        .write = arc_write
+        .write = arc_write,
+        .read = arc_read
 };
 

arch/mips32/src/exception.c

@@ -143 +143 @@
         int cause;
         int excno;
-        __u32 epc_shift = 0;
 
         ASSERT(CPU != NULL);

arch/mips32/src/interrupt.c

@@ -94 +94 @@
 void interrupt_init(void)
 {
-        int i;
-
         int_register(TIMER_IRQ, "timer", timer_exception);
         int_register(0, "swint0", swint0);