Changeset 204 for trunk/kernel/devices

Timestamp:

Jul 17, 2017, 8:42:59 AM (7 years ago)

Author:

alain

Message:

Bug fix in kernel_init
-This line, and those below, will be ignored--

M params.mk
M kernel_config.h
M Makefile
M hdd/virt_hdd.dmg
M tools/bootloader_tsar/boot.c
M kernel/libk/bits.h
M kernel/libk/elf.c
M kernel/libk/xhtab.c
M kernel/libk/elf.h
M kernel/libk/xhtab.h
M kernel/devices/dev_pic.c
M kernel/mm/vmm.c
M kernel/mm/mapper.c
M kernel/mm/mapper.h
M kernel/vfs/devfs.h
M kernel/vfs/vfs.c
M kernel/vfs/vfs.h
M kernel/vfs/devfs.c
M kernel/kern/chdev.h
M kernel/kern/kernel_init.c
M kernel/kern/process.c
M kernel/kern/process.h
M hal/tsar_mips32/core/hal_remote.c
M hal/tsar_mips32/drivers/soclib_pic.c

File:

• trunk/kernel/devices/dev_pic.c (modified) (3 diffs)

trunk/kernel/devices/dev_pic.c

@@ -26 +26 @@
 #include <chdev.h>
 #include <printk.h>
-#include <hal_drivers.h>
+#include <soclib_pic.h>
 #include <dev_pic.h>
 #include <cluster.h>
@@ -50 +50 @@
     {
         // call the PIC SOCLIB driver
-        hal_drivers_pic_init( pic );
+        soclib_pic_init( pic );
+
+        // update the PIC chdev extension
+        pic->ext.pic.enable_timer = &soclib_pic_enable_timer;
+        pic->ext.pic.enable_irq   = &soclib_pic_enable_irq;
+        pic->ext.pic.disable_irq  = &soclib_pic_disable_irq;
+        pic->ext.pic.bind_irq     = &soclib_pic_bind_irq;
+        pic->ext.pic.send_ipi     = &soclib_pic_send_ipi;
+        pic->ext.pic.extend_init  = &soclib_pic_extend_init;
     }
     else if( impl == IMPL_PIC_I86 )
@@ -70 +78 @@
 
     // get pointer on extend_init function
-    pic_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) );
+    pic_init_t * f = hal_remote_lpt( XPTR( pic_cxy , &pic_ptr->ext.pic.extend_init ) ); 
 
     // call relevant driver function