Changes in kernel/arch/ppc32/src/ppc32.c [3a2f8aa:eae4e8f] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/arch/ppc32/src/ppc32.c
r3a2f8aa reae4e8f 39 39 #include <genarch/kbrd/kbrd.h> 40 40 #include <arch/interrupt.h> 41 #include <interrupt.h>42 41 #include <genarch/fb/fb.h> 43 42 #include <genarch/fb/visuals.h> … … 48 47 #include <proc/uarg.h> 49 48 #include <console/console.h> 50 #include <sysinfo/sysinfo.h>51 49 #include <ddi/irq.h> 52 50 #include <arch/drivers/pic.h> … … 60 58 61 59 bootinfo_t bootinfo; 62 63 static cir_t pic_cir;64 static void *pic_cir_arg;65 60 66 61 /** Performs ppc32-specific initialization before main_bsp() is called. */ … … 191 186 if (assigned_address) { 192 187 /* Initialize PIC */ 193 pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir, 194 &pic_cir_arg); 195 188 cir_t cir; 189 void *cir_arg; 190 pic_init(assigned_address[0].addr, PAGE_SIZE, &cir, &cir_arg); 191 196 192 #ifdef CONFIG_MAC_KBD 197 193 uintptr_t pa = assigned_address[0].addr + 0x16000; … … 205 201 /* Initialize I/O controller */ 206 202 cuda_instance_t *cuda_instance = 207 cuda_init(cuda, IRQ_CUDA, pic_cir, pic_cir_arg);203 cuda_init(cuda, IRQ_CUDA, cir, cir_arg); 208 204 if (cuda_instance) { 209 205 kbrd_instance_t *kbrd_instance = kbrd_init(); … … 215 211 } 216 212 } 217 218 /*219 * This is the necessary evil until the userspace driver is entirely220 * self-sufficient.221 */222 sysinfo_set_item_val("cuda", NULL, true);223 sysinfo_set_item_val("cuda.inr", NULL, IRQ_CUDA);224 sysinfo_set_item_val("cuda.address.physical", NULL, pa);225 sysinfo_set_item_val("cuda.address.kernel", NULL,226 (uintptr_t) cuda);227 213 #endif 228 214 } … … 230 216 /* Consider only a single device for now */ 231 217 return false; 232 }233 234 void irq_initialize_arch(irq_t *irq)235 {236 irq->cir = pic_cir;237 irq->cir_arg = pic_cir_arg;238 irq->preack = true;239 218 } 240 219
Note:
See TracChangeset
for help on using the changeset viewer.