Changeset f817d3a in mainline for kernel

Timestamp:

2009-01-29T17:24:35Z (17 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

43d6401

Parents:

26c67a8

Message:

use macio optionally

Location:

kernel/arch/ppc32

Files:

• include/boot/boot.h (modified) (2 diffs)
• src/drivers/cuda.c (modified) (6 diffs)
• src/drivers/pic.c (modified) (5 diffs)
• src/ppc32.c (modified) (1 diff)

kernel/arch/ppc32/include/boot/boot.h

@@ -80 +80 @@
         uintptr_t addr;
         unsigned int size;
-} keyboard_t;
+} macio_t;
 
 typedef struct {
@@ -86 +86 @@
         taskmap_t taskmap;
         screen_t screen;
-        keyboard_t keyboard;
+        macio_t macio;
 } bootinfo_t;
 

kernel/arch/ppc32/src/drivers/cuda.c

@@ -237 +237 @@
 int cuda_get_scancode(void)
 {
-        uint8_t kind;
-        uint8_t data[4];
-        
-        receive_packet(&kind, 4, data);
-        
-        if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c))
-                return data[2];
+        if (cuda) {
+                uint8_t kind;
+                uint8_t data[4];
+                
+                receive_packet(&kind, 4, data);
+                
+                if ((kind == PACKET_ADB) && (data[0] == 0x40) && (data[1] == 0x2c))
+                        return data[2];
+        }
         
         return -1;
@@ -272 +274 @@
 void cuda_grab(void)
 {
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&cuda_irq.lock);
-        cuda_irq.notif_cfg.notify = false;
-        spinlock_unlock(&cuda_irq.lock);
-        interrupts_restore(ipl);
+        if (cuda) {
+                ipl_t ipl = interrupts_disable();
+                spinlock_lock(&cuda_irq.lock);
+                cuda_irq.notif_cfg.notify = false;
+                spinlock_unlock(&cuda_irq.lock);
+                interrupts_restore(ipl);
+        }
 }
 
@@ -283 +287 @@
 void cuda_release(void)
 {
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&cuda_irq.lock);
-        if (cuda_irq.notif_cfg.answerbox)
-                cuda_irq.notif_cfg.notify = true;
-        spinlock_unlock(&cuda_irq.unlock);
-        interrupts_restore(ipl);
+        if (cuda) {
+                ipl_t ipl = interrupts_disable();
+                spinlock_lock(&cuda_irq.lock);
+                if (cuda_irq.notif_cfg.answerbox)
+                        cuda_irq.notif_cfg.notify = true;
+                spinlock_unlock(&cuda_irq.unlock);
+                interrupts_restore(ipl);
+        }
 }
 
@@ -294 +300 @@
 void cuda_init(devno_t devno, uintptr_t base, size_t size)
 {
-        cuda = (uint8_t *) hw_map(base, size);  
+        cuda = (uint8_t *) hw_map(base, size);
         
         chardev_initialize("cuda_kbd", &kbrd, &ops);
@@ -307 +313 @@
         
         pic_enable_interrupt(CUDA_IRQ);
-
+        
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.devno", NULL, devno);
@@ -346 +352 @@
 
 void arch_reboot(void) {
-        send_packet(PACKET_CUDA, 1, CUDA_RESET);
+        if (cuda)
+                send_packet(PACKET_CUDA, 1, CUDA_RESET);
+        
         asm volatile (
                 "b 0\n"

kernel/arch/ppc32/src/drivers/pic.c

@@ -39 +39 @@
 #include <bitops.h>
 
-static volatile uint32_t *pic;
+static volatile uint32_t *pic = NULL;
 
 void pic_init(uintptr_t base, size_t size)
@@ -48 +48 @@
 void pic_enable_interrupt(int intnum)
 {
-        if (intnum < 32) {
-                pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
-        } else {
-                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
+        if (pic) {
+                if (intnum < 32)
+                        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] | (1 << intnum);
+                else
+                        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32));
         }
         
@@ -58 +59 @@
 void pic_disable_interrupt(int intnum)
 {
-        if (intnum < 32) {
-                pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
-        } else {
-                pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
+        if (pic) {
+                if (intnum < 32)
+                        pic[PIC_MASK_LOW] = pic[PIC_MASK_LOW] & (~(1 << intnum));
+                else
+                        pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] & (~(1 << (intnum - 32)));
         }
 }
@@ -67 +69 @@
 void pic_ack_interrupt(int intnum)
 {
-        if (intnum < 32) 
-                pic[PIC_ACK_LOW] = 1 << intnum;
-        else 
-                pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
+        if (pic) {
+                if (intnum < 32) 
+                        pic[PIC_ACK_LOW] = 1 << intnum;
+                else
+                        pic[PIC_ACK_HIGH] = 1 << (intnum - 32);
+        }
 }
 
@@ -76 +80 @@
 int pic_get_pending(void)
 {
-        int pending;
-
-        pending = pic[PIC_PENDING_LOW];
-        if (pending)
-                return fnzb32(pending);
-        
-        pending = pic[PIC_PENDING_HIGH];
-        if (pending)
-                return fnzb32(pending) + 32;
+        if (pic) {
+                int pending;
+                
+                pending = pic[PIC_PENDING_LOW];
+                if (pending)
+                        return fnzb32(pending);
+                
+                pending = pic[PIC_PENDING_HIGH];
+                if (pending)
+                        return fnzb32(pending) + 32;
+        }
         
         return -1;

kernel/arch/ppc32/src/ppc32.c

@@ -77 +77 @@
         if (config.cpu_active == 1) {
                 /* Initialize framebuffer */
-                unsigned int visual;
-                
-                switch (bootinfo.screen.bpp) {
-                case 8:
-                        visual = VISUAL_INDIRECT_8;
-                        break;
-                case 16:
-                        visual = VISUAL_RGB_5_5_5;
-                        break;
-                case 24:
-                        visual = VISUAL_RGB_8_8_8;
-                        break;
-                case 32:
-                        visual = VISUAL_RGB_0_8_8_8;
-                        break;
-                default:
-                        panic("Unsupported bits per pixel.");
+                if (bootinfo.screen.addr) {
+                        unsigned int visual;
+                        
+                        switch (bootinfo.screen.bpp) {
+                        case 8:
+                                visual = VISUAL_INDIRECT_8;
+                                break;
+                        case 16:
+                                visual = VISUAL_RGB_5_5_5;
+                                break;
+                        case 24:
+                                visual = VISUAL_RGB_8_8_8;
+                                break;
+                        case 32:
+                                visual = VISUAL_RGB_0_8_8_8;
+                                break;
+                        default:
+                                panic("Unsupported bits per pixel.");
+                        }
+                        fb_properties_t prop = {
+                                .addr = bootinfo.screen.addr,
+                                .offset = 0,
+                                .x = bootinfo.screen.width,
+                                .y = bootinfo.screen.height,
+                                .scan = bootinfo.screen.scanline,
+                                .visual = visual,
+                        };
+                        fb_init(&prop);
                 }
-                fb_properties_t prop = {
-                        .addr = bootinfo.screen.addr,
-                        .offset = 0,
-                        .x = bootinfo.screen.width,
-                        .y = bootinfo.screen.height,
-                        .scan = bootinfo.screen.scanline,
-                        .visual = visual,
-                };
-                fb_init(&prop);
                 
                 /* Initialize IRQ routing */
                 irq_init(IRQ_COUNT, IRQ_COUNT);
-        
-                /* Initialize PIC */
-                pic_init(bootinfo.keyboard.addr, PAGE_SIZE);
                 
-                /* Initialize I/O controller */
-                cuda_init(device_assign_devno(),
-                    bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
+                if (bootinfo.macio.addr) {
+                        /* Initialize PIC */
+                        pic_init(bootinfo.macio.addr, PAGE_SIZE);
+                        
+                        /* Initialize I/O controller */
+                        cuda_init(device_assign_devno(),
+                            bootinfo.macio.addr + 0x16000, 2 * PAGE_SIZE);
+                }
                 
                 /* Merge all zones to 1 big zone */