Changes in / [89ee7ff:ab4bace] in mainline
- Files:
-
- 18 added
- 7 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/amd64/Makefile.inc
r89ee7ff rab4bace 33 33 $(USPACEDIR)/srv/hw/char/i8042/i8042 \ 34 34 $(USPACEDIR)/srv/hw/bus/pci/pci \ 35 $(USPACEDIR)/srv/hid/c _mouse/c_mouse35 $(USPACEDIR)/srv/hid/char_mouse/char_ms 36 36 37 37 MODULES := $(notdir $(COMPONENTS)) -
boot/arch/ia64/loader/Makefile.common
r89ee7ff rab4bace 49 49 RD_SRVS += \ 50 50 $(USPACEDIR)/srv/hw/char/i8042/i8042 \ 51 $(USPACEDIR)/srv/hid/c _mouse/c_mouse51 $(USPACEDIR)/srv/hid/char_mouse/char_ms 52 52 endif -
boot/arch/ppc32/loader/Makefile.common
r89ee7ff rab4bace 43 43 KERNELDIR = ../../../../kernel 44 44 USPACEDIR = ../../../../uspace 45 46 RD_SRVS += \ 47 $(USPACEDIR)/srv/hid/adb_mouse/adb_ms \ 48 $(USPACEDIR)/srv/hw/bus/cuda_adb/cuda_adb -
kernel/arch/abs32le/src/abs32le.c
r89ee7ff rab4bace 102 102 } 103 103 104 void irq_initialize_arch(irq_t *irq) 105 { 106 (void) irq; 107 } 108 104 109 /** @} 105 110 */ -
kernel/arch/amd64/src/amd64.c
r89ee7ff rab4bace 278 278 } 279 279 280 void irq_initialize_arch(irq_t *irq) 281 { 282 (void) irq; 283 } 284 280 285 /** @} 281 286 */ -
kernel/arch/arm32/src/arm32.c
r89ee7ff rab4bace 179 179 } 180 180 181 void irq_initialize_arch(irq_t *irq) 182 { 183 (void) irq; 184 } 185 181 186 /** @} 182 187 */ -
kernel/arch/ia32/src/ia32.c
r89ee7ff rab4bace 234 234 } 235 235 236 void irq_initialize_arch(irq_t *irq) 237 { 238 (void) irq; 239 } 240 236 241 /** @} 237 242 */ -
kernel/arch/ia64/src/ia64.c
r89ee7ff rab4bace 44 44 #include <arch/stack.h> 45 45 #include <arch/mm/page.h> 46 #include <interrupt.h> 46 47 #include <mm/as.h> 47 48 #include <config.h> … … 280 281 } 281 282 283 void irq_initialize_arch(irq_t *irq) 284 { 285 (void) irq; 286 } 287 282 288 /** @} 283 289 */ -
kernel/arch/mips32/src/mips32.c
r89ee7ff rab4bace 46 46 #include <sysinfo/sysinfo.h> 47 47 #include <arch/interrupt.h> 48 #include <interrupt.h> 48 49 #include <console/chardev.h> 49 50 #include <arch/barrier.h> … … 257 258 } 258 259 260 void irq_initialize_arch(irq_t *irq) 261 { 262 (void) irq; 263 } 264 259 265 /** @} 260 266 */ -
kernel/arch/ppc32/src/ppc32.c
r89ee7ff rab4bace 39 39 #include <genarch/kbrd/kbrd.h> 40 40 #include <arch/interrupt.h> 41 #include <interrupt.h> 41 42 #include <genarch/fb/fb.h> 42 43 #include <genarch/fb/visuals.h> … … 47 48 #include <proc/uarg.h> 48 49 #include <console/console.h> 50 #include <sysinfo/sysinfo.h> 49 51 #include <ddi/irq.h> 50 52 #include <arch/drivers/pic.h> … … 58 60 59 61 bootinfo_t bootinfo; 62 63 static cir_t pic_cir; 64 static void *pic_cir_arg; 60 65 61 66 /** Performs ppc32-specific initialization before main_bsp() is called. */ … … 186 191 if (assigned_address) { 187 192 /* Initialize PIC */ 188 cir_t cir; 189 void *cir_arg; 190 pic_init(assigned_address[0].addr, PAGE_SIZE, &cir, &cir_arg); 191 193 pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir, 194 &pic_cir_arg); 195 192 196 #ifdef CONFIG_MAC_KBD 193 197 uintptr_t pa = assigned_address[0].addr + 0x16000; … … 201 205 /* Initialize I/O controller */ 202 206 cuda_instance_t *cuda_instance = 203 cuda_init(cuda, IRQ_CUDA, cir,cir_arg);207 cuda_init(cuda, IRQ_CUDA, pic_cir, pic_cir_arg); 204 208 if (cuda_instance) { 205 209 kbrd_instance_t *kbrd_instance = kbrd_init(); … … 211 215 } 212 216 } 217 218 /* 219 * This is the necessary evil until the userspace driver is entirely 220 * 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); 213 227 #endif 214 228 } … … 216 230 /* Consider only a single device for now */ 217 231 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; 218 239 } 219 240 -
kernel/arch/sparc64/src/sparc64.c
r89ee7ff rab4bace 44 44 #include <arch/mm/page.h> 45 45 #include <arch/stack.h> 46 #include <interrupt.h> 46 47 #include <genarch/ofw/ofw_tree.h> 47 48 #include <userspace.h> … … 166 167 } 167 168 169 void irq_initialize_arch(irq_t *irq) 170 { 171 (void) irq; 172 } 173 168 174 /** @} 169 175 */ -
kernel/generic/include/interrupt.h
r89ee7ff rab4bace 51 51 void exc_init(void); 52 52 53 extern void irq_initialize_arch(irq_t *irq); 54 53 55 #endif 54 56 -
kernel/generic/src/ddi/irq.c
r89ee7ff rab4bace 74 74 #include <synch/spinlock.h> 75 75 #include <console/console.h> 76 #include <interrupt.h> 76 77 #include <memstr.h> 77 78 #include <arch.h> … … 169 170 irq->inr = -1; 170 171 irq->devno = -1; 172 173 irq_initialize_arch(irq); 171 174 } 172 175 -
uspace/Makefile
r89ee7ff rab4bace 59 59 srv/fs/tmpfs \ 60 60 srv/fs/devfs \ 61 srv/hid/adb_mouse \ 61 62 srv/hid/console \ 62 srv/hid/c _mouse \63 srv/hid/char_mouse \ 63 64 srv/hid/fb \ 64 65 srv/hid/kbd \ … … 71 72 ifeq ($(UARCH),ia32) 72 73 DIRS += srv/hw/bus/pci 74 endif 75 76 ifeq ($(UARCH),ppc32) 77 DIRS += srv/hw/bus/cuda_adb 73 78 endif 74 79 -
uspace/app/init/init.c
r89ee7ff rab4bace 287 287 spawn("/srv/fhc"); 288 288 spawn("/srv/obio"); 289 srv_start("/srv/cuda_adb"); 289 290 srv_start("/srv/i8042"); 290 srv_start("/srv/c_mouse"); 291 srv_start("/srv/adb_ms"); 292 srv_start("/srv/char_ms"); 291 293 292 294 spawn("/srv/fb"); … … 320 322 getterm("term/vc5", "/app/bdsh"); 321 323 getterm("term/vc6", "/app/klog"); 322 324 323 325 return 0; 324 326 } -
uspace/srv/hid/kbd/Makefile.build
r89ee7ff rab4bace 125 125 ifeq ($(UARCH),ppc32) 126 126 SOURCES += \ 127 port/ dummy.c \128 ctl/ stty.c127 port/adb.c \ 128 ctl/apple.c 129 129 endif 130 130
Note:
See TracChangeset
for help on using the changeset viewer.