Changeset 252 for trunk

Timestamp:

Jul 20, 2017, 1:30:05 PM (7 years ago)

Author:

max@…

Message:

Hide IMPL_PIC_.

Location:

trunk

Files:

• hal/generic/hal_drivers.h (modified) (1 diff)
• hal/tsar_mips32/core/hal_drivers.c (modified) (1 diff)
• hal/x86_64/core/hal_drivers.c (modified) (1 diff)
• hal/x86_64/core/hal_init.c (modified) (2 diffs)
• kernel/devices/dev_pic.c (modified) (1 diff)

trunk/hal/generic/hal_drivers.h

@@ -27 +27 @@
 void hal_drivers_txt_init(chdev_t *txt, uint32_t impl);
 
-void hal_drivers_pic_init(chdev_t *pic);
+void hal_drivers_pic_init(chdev_t *pic, uint32_t impl);
 
 void hal_drivers_ioc_init(chdev_t *ioc, uint32_t impl);

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -53 +53 @@
 
 //////////////////////////////////////////
-void hal_drivers_pic_init( chdev_t * pic )
+void hal_drivers_pic_init( chdev_t  * pic,
+                           uint32_t   impl )
 {
+    if( impl != IMPL_PIC_SCL )
+    {
+        assert( false , __FUNCTION__ , "undefined PIC device implementation" );
+    }
+
         soclib_pic_init( pic );
 

trunk/hal/x86_64/core/hal_drivers.c

@@ -36 +36 @@
 /* -------------------------------------------------------------------------- */
 
-void hal_drivers_pic_init(chdev_t *pic)
+void hal_drivers_pic_init(chdev_t *pic, uint32_t impl)
 {
+        if (impl != IMPL_PIC_I86) {
+                x86_panic("undefined PIC device implementation");
+        }
+
         pic_apic_init(pic);
 

trunk/hal/x86_64/core/hal_init.c

@@ -189 +189 @@
 
         dev->base = 0;
-        dev->type = (DEV_FUNC_PIC << 16) | IMPL_PIC_SCL;
+        dev->type = (DEV_FUNC_PIC << 16) | IMPL_PIC_I86;
         dev->channels = 1;
         dev->param0 = 0;
@@ -253 +253 @@
         info->rsvd_nr = init_bootinfo_rsvd((boot_rsvd_t *)&info->rsvd);
 
-        /* TODO: dev_icu */
         /* TODO: dev_mmc */
         /* TODO: dev_dma */

trunk/kernel/devices/dev_pic.c

@@ -45 +45 @@
     strcpy( pic->name , "pic" );
 
-    // call the relevant driver init function,
-    // and register commands in PIC device extension
-    if( impl == IMPL_PIC_SCL )
-    {
-        // call the implementation-specific PIC driver
-        hal_drivers_pic_init(pic);
-    }
-    else if( impl == IMPL_PIC_I86 )
-    {
-        assert( false , __FUNCTION__ , "missing implementation for X86\n" );
-    }
-    else
-    {
-        assert( false , __FUNCTION__ , "undefined PIC device implementation" );
-    }
-} // end dev_pic_init()
+    // call the implementation-specific PIC driver
+    hal_drivers_pic_init(pic, impl);
+}
 
 /////////////////////////////////////////////////