Changeset 1e0a5fc in mainline

Timestamp:

2006-06-20T12:03:35Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

cc73a8a1

Parents:

3c5006a0

Message:

don't use hardcoded PIC address

Location:

arch/ppc32

Files:

• include/drivers/pic.h (modified) (4 diffs)
• src/drivers/pic.c (modified) (1 diff)
• src/ppc32.c (modified) (1 diff)

arch/ppc32/include/drivers/pic.h

@@ -27 +27 @@
  */
 
- /** @addtogroup ppc32  
+/** @addtogroup ppc32   
  * @{
  */
@@ -36 +36 @@
 #define __PIC_H_
 
-/* PIC handler, read from pearpc source codes */
-#define PIC_HW_ADDR 0x80800000
-
 #define PIC_PENDING_LOW    8
 #define PIC_PENDING_HIGH   4
@@ -46 +43 @@
 #define PIC_ACK_HIGH       6
 
-void pic_init(void);
+void pic_init(__address base, size_t size);
 void pic_enable_interrupt(int intnum);
 void pic_disable_interrupt(int intnum);
@@ -54 +51 @@
 #endif
 
- /** @}
+/** @}
  */
-

arch/ppc32/src/drivers/pic.c

@@ -41 +41 @@
 static volatile __u32 *pic;
 
-void pic_init(void)
+void pic_init(__address base, size_t size)
 {
-        pic = (__u32 *)hw_map(PIC_HW_ADDR, PAGE_SIZE);
+        pic = (__u32 *) hw_map(base, size);
 }
 

arch/ppc32/src/ppc32.c

@@ -74 +74 @@
         
                 /* Initialize PIC */
-                pic_init();
+                pic_init(bootinfo.keyboard.addr, PAGE_SIZE);
                 
-                cuda_init(bootinfo.keyboard.addr, bootinfo.keyboard.size);
+                cuda_init(bootinfo.keyboard.addr + 0x16000, 2 * PAGE_SIZE);
                 
                 /* Merge all zones to 1 big zone */