Changes in / [ab4bace:89ee7ff] in mainline
- Files:
-
- 7 added
- 18 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
boot/arch/amd64/Makefile.inc
rab4bace r89ee7ff 33 33 $(USPACEDIR)/srv/hw/char/i8042/i8042 \ 34 34 $(USPACEDIR)/srv/hw/bus/pci/pci \ 35 $(USPACEDIR)/srv/hid/c har_mouse/char_ms35 $(USPACEDIR)/srv/hid/c_mouse/c_mouse 36 36 37 37 MODULES := $(notdir $(COMPONENTS)) -
boot/arch/ia64/loader/Makefile.common
rab4bace r89ee7ff 49 49 RD_SRVS += \ 50 50 $(USPACEDIR)/srv/hw/char/i8042/i8042 \ 51 $(USPACEDIR)/srv/hid/c har_mouse/char_ms51 $(USPACEDIR)/srv/hid/c_mouse/c_mouse 52 52 endif -
boot/arch/ppc32/loader/Makefile.common
rab4bace r89ee7ff 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
rab4bace r89ee7ff 102 102 } 103 103 104 void irq_initialize_arch(irq_t *irq)105 {106 (void) irq;107 }108 109 104 /** @} 110 105 */ -
kernel/arch/amd64/src/amd64.c
rab4bace r89ee7ff 278 278 } 279 279 280 void irq_initialize_arch(irq_t *irq)281 {282 (void) irq;283 }284 285 280 /** @} 286 281 */ -
kernel/arch/arm32/src/arm32.c
rab4bace r89ee7ff 179 179 } 180 180 181 void irq_initialize_arch(irq_t *irq)182 {183 (void) irq;184 }185 186 181 /** @} 187 182 */ -
kernel/arch/ia32/src/ia32.c
rab4bace r89ee7ff 234 234 } 235 235 236 void irq_initialize_arch(irq_t *irq)237 {238 (void) irq;239 }240 241 236 /** @} 242 237 */ -
kernel/arch/ia64/src/ia64.c
rab4bace r89ee7ff 44 44 #include <arch/stack.h> 45 45 #include <arch/mm/page.h> 46 #include <interrupt.h>47 46 #include <mm/as.h> 48 47 #include <config.h> … … 281 280 } 282 281 283 void irq_initialize_arch(irq_t *irq)284 {285 (void) irq;286 }287 288 282 /** @} 289 283 */ -
kernel/arch/mips32/src/mips32.c
rab4bace r89ee7ff 46 46 #include <sysinfo/sysinfo.h> 47 47 #include <arch/interrupt.h> 48 #include <interrupt.h>49 48 #include <console/chardev.h> 50 49 #include <arch/barrier.h> … … 258 257 } 259 258 260 void irq_initialize_arch(irq_t *irq)261 {262 (void) irq;263 }264 265 259 /** @} 266 260 */ -
kernel/arch/ppc32/src/ppc32.c
rab4bace r89ee7ff 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 -
kernel/arch/sparc64/src/sparc64.c
rab4bace r89ee7ff 44 44 #include <arch/mm/page.h> 45 45 #include <arch/stack.h> 46 #include <interrupt.h>47 46 #include <genarch/ofw/ofw_tree.h> 48 47 #include <userspace.h> … … 167 166 } 168 167 169 void irq_initialize_arch(irq_t *irq)170 {171 (void) irq;172 }173 174 168 /** @} 175 169 */ -
kernel/generic/include/interrupt.h
rab4bace r89ee7ff 51 51 void exc_init(void); 52 52 53 extern void irq_initialize_arch(irq_t *irq);54 55 53 #endif 56 54 -
kernel/generic/src/ddi/irq.c
rab4bace r89ee7ff 74 74 #include <synch/spinlock.h> 75 75 #include <console/console.h> 76 #include <interrupt.h>77 76 #include <memstr.h> 78 77 #include <arch.h> … … 170 169 irq->inr = -1; 171 170 irq->devno = -1; 172 173 irq_initialize_arch(irq);174 171 } 175 172 -
uspace/Makefile
rab4bace r89ee7ff 59 59 srv/fs/tmpfs \ 60 60 srv/fs/devfs \ 61 srv/hid/adb_mouse \62 61 srv/hid/console \ 63 srv/hid/c har_mouse \62 srv/hid/c_mouse \ 64 63 srv/hid/fb \ 65 64 srv/hid/kbd \ … … 72 71 ifeq ($(UARCH),ia32) 73 72 DIRS += srv/hw/bus/pci 74 endif75 76 ifeq ($(UARCH),ppc32)77 DIRS += srv/hw/bus/cuda_adb78 73 endif 79 74 -
uspace/app/init/init.c
rab4bace r89ee7ff 287 287 spawn("/srv/fhc"); 288 288 spawn("/srv/obio"); 289 srv_start("/srv/cuda_adb");290 289 srv_start("/srv/i8042"); 291 srv_start("/srv/adb_ms"); 292 srv_start("/srv/char_ms"); 290 srv_start("/srv/c_mouse"); 293 291 294 292 spawn("/srv/fb"); … … 322 320 getterm("term/vc5", "/app/bdsh"); 323 321 getterm("term/vc6", "/app/klog"); 324 322 325 323 return 0; 326 324 } -
uspace/srv/hid/kbd/Makefile.build
rab4bace r89ee7ff 125 125 ifeq ($(UARCH),ppc32) 126 126 SOURCES += \ 127 port/ adb.c \128 ctl/ apple.c127 port/dummy.c \ 128 ctl/stty.c 129 129 endif 130 130
Note:
See TracChangeset
for help on using the changeset viewer.