Changeset 39ae77b in mainline

Timestamp:

2005-09-05T21:52:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e84439a

Parents:

8f1560b

Message:

Change processor type in simics.conf to x86-hammer.
This way it supports both IA-32 and AMD64.

Fix comment in i8259.c.

Files:

• arch/ia32/src/drivers/i8259.c (modified) (1 diff)
• contrib/conf/simics.conf (modified) (1 diff)

arch/ia32/src/drivers/i8259.c

@@ -59 +59 @@
         outb(PIC_PIC1PORT2, IVT_IRQBASE + 8);
 
-        /* ICW3: pic1 is known as PIC_PIC1ID */
+        /* ICW3: pic1 is known as IRQ_PIC1 */
         outb(PIC_PIC1PORT2, IRQ_PIC1);
 

contrib/conf/simics.conf

@@ -9 +9 @@
 #@num_processors = 1
 
-@if not "cpu_class"               in dir(): cpu_class = "x86-p4"
+@if not "cpu_class"               in dir(): cpu_class = "x86-hammer"
 @if not "clock_freq_mhz"          in dir(): clock_freq_mhz = 40
 @if not "memory_megs"             in dir(): memory_megs = 256