Changeset 245 for trunk/hal

Timestamp:

Jul 20, 2017, 12:46:10 PM (7 years ago)

Author:

max@…

Message:

Hide soclib_tty.

Location:

trunk/hal

Files:

• generic/hal_drivers.h (modified) (1 diff)
• tsar_mips32/core/hal_drivers.c (modified) (2 diffs)
• x86_64/core/hal_drivers.c (modified) (1 diff)

trunk/hal/generic/hal_drivers.h

@@ -25 +25 @@
 #include <chdev.h>
 
-void hal_drivers_txt_init(chdev_t *dev);
-void hal_drivers_xcu_init(chdev_t *dev, lid_t lid);
-void hal_drivers_xcu_disable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid);
-void hal_drivers_xcu_enable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid);
+void hal_drivers_txt_init(chdev_t *txt, uint32_t impl);
 
-void hal_drivers_pic_init(chdev_t *dev);
+void hal_drivers_pic_init(chdev_t *pic);
 
-void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl);
+void hal_drivers_ioc_init(chdev_t *ioc, uint32_t impl);
 
 #endif  /* HAL_DRIVERS_H_ */

trunk/hal/tsar_mips32/core/hal_drivers.c

@@ -16 +16 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
+ * along with ALMOS-MKH; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
@@ -35 +35 @@
 
 //////////////////////////////////////////
-void hal_drivers_txt_init( chdev_t * txt )
+void hal_drivers_txt_init( chdev_t  * txt,
+                           uint32_t   impl )
 {
-        soclib_tty_init( txt );
+        if( impl == IMPL_TXT_TTY )
+        {
+                soclib_tty_init( txt );
+        }
+        else
+        {
+                assert( false , __FUNCTION__ , "undefined TXT device implementation" );
+        }
 }
 

trunk/hal/x86_64/core/hal_drivers.c

@@ -30 +30 @@
 #include <pic_apic.h>
 
-void hal_drivers_txt_init(chdev_t *dev)
+void hal_drivers_txt_init(chdev_t *txt, uint32_t impl)
 {
-        soclib_tty_init(dev);
+        soclib_tty_init(txt);
 }
 
 /* -------------------------------------------------------------------------- */
 
-void hal_drivers_xcu_init(chdev_t *dev, lid_t lid)
+void hal_drivers_pic_init(chdev_t *pic)
 {
-        soclib_xcu_init(dev, lid);
-}
+        pic_apic_init(pic);
 
-void hal_drivers_xcu_disable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid)
-{
-        soclib_xcu_disable_irq(icu, irq_index, irq_type, lid);
-}
-
-void hal_drivers_xcu_enable_irq(chdev_t *icu, uint32_t irq_index,
-    uint32_t irq_type, lid_t lid)
-{
-        soclib_xcu_enable_irq(icu, irq_index, irq_type, lid);
+        /* update the PIC chdev extension */
+        pic->ext.pic.enable_timer = &pic_apic_enable_timer;
+        pic->ext.pic.enable_irq   = &pic_apic_enable_irq;
+        pic->ext.pic.disable_irq  = &pic_apic_disable_irq;
+        pic->ext.pic.bind_irq     = &pic_apic_bind_irq;
+        pic->ext.pic.send_ipi     = &pic_apic_send_ipi;
+        pic->ext.pic.extend_init  = &pic_apic_extend_init;
 }
 
 /* -------------------------------------------------------------------------- */
 
-void hal_drivers_pic_init(chdev_t *dev)
+void hal_drivers_ioc_init(chdev_t *ioc, uint32_t impl)
 {
-        pic_apic_init(dev);
-
-        /* update the PIC chdev extension */
-        dev->ext.pic.enable_timer = &pic_apic_enable_timer;
-        dev->ext.pic.enable_irq   = &pic_apic_enable_irq;
-        dev->ext.pic.disable_irq  = &pic_apic_disable_irq;
-        dev->ext.pic.bind_irq     = &pic_apic_bind_irq;
-        dev->ext.pic.send_ipi     = &pic_apic_send_ipi;
-        dev->ext.pic.extend_init  = &pic_apic_extend_init;
+        ioc_ata_init(ioc);
 }
 
-/* -------------------------------------------------------------------------- */
-
-void hal_drivers_ioc_init(chdev_t *dev, uint32_t impl)
-{
-        ioc_ata_init(dev);
-}
-