Changeset 280

Timestamp:

Jul 27, 2017, 10:21:51 AM (7 years ago)

Author:

max@…

Message:

sync

Location:

trunk/hal/x86_64

Files:

• core/hal_drivers.c (modified) (1 diff)
• core/hal_special.c (modified) (1 diff)
• drivers/ioc_ata.c (modified) (1 diff)
• drivers/pic_apic.c (modified) (1 diff)
• drivers/pic_apic.h (modified) (1 diff)
• drivers/txt_rs232.c (modified) (2 diffs)

trunk/hal/x86_64/core/hal_drivers.c

@@ -50 +50 @@
         /* update the PIC chdev extension */
         pic->ext.pic.enable_timer = &pic_apic_enable_timer;
+        pic->ext.pic.enable_ipi   = &pic_apic_enable_ipi;
         pic->ext.pic.enable_irq   = &pic_apic_enable_irq;
         pic->ext.pic.disable_irq  = &pic_apic_disable_irq;

trunk/hal/x86_64/core/hal_special.c

@@ -51 +51 @@
 {
         return rdtsc();
+}
+
+inline reg_t hal_get_sr()
+{
+        return 0;
 }
 

trunk/hal/x86_64/drivers/ioc_ata.c

@@ -208 +208 @@
 
         // get command arguments and extended pointer on IOC device
-        cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.type   ) );
-        lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.lba    ) );
-        count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.count  ) );
-        buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.ioc.buf_xp ) );
+        cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
+        lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba    ) );
+        count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
+        buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
 
         /* execute operation */

trunk/hal/x86_64/drivers/pic_apic.c

@@ -141 +141 @@
 }
 
+void pic_apic_enable_ipi()
+{
+        x86_panic((char *)__func__);
+}
+
 void pic_apic_send_ipi(cxy_t cxy, lid_t lid)
 {

trunk/hal/x86_64/drivers/pic_apic.h

@@ -25 +25 @@
 #include <hal_types.h>
 
-void pic_apic_init( chdev_t * pic );
-void pic_apic_extend_init( uint32_t * xcu_base );
-void pic_apic_bind_irq( lid_t     lid,
-                        chdev_t * src_chdev );
-void pic_apic_enable_irq( lid_t   lid,
-                          xptr_t  src_chdev_xp );
-void pic_apic_disable_irq( lid_t   lid,
-                           xptr_t  src_chdev_xp );
-void pic_apic_enable_timer( uint32_t period );
-
-void pic_apic_send_ipi( cxy_t    cxy,
-                        lid_t    lid );
+void pic_apic_init(chdev_t *pic);
+void pic_apic_extend_init(uint32_t *xcu_base);
+void pic_apic_bind_irq(lid_t lid, chdev_t *src_chdev);
+void pic_apic_enable_irq(lid_t lid, xptr_t src_chdev_xp);
+void pic_apic_disable_irq(lid_t lid, xptr_t src_chdev_xp);
+void pic_apic_enable_timer(uint32_t period);
+void pic_apic_enable_ipi();
+void pic_apic_send_ipi(cxy_t cxy, lid_t lid);
 
 #endif  /* _PIC_APIC_H_ */

trunk/hal/x86_64/drivers/txt_rs232.c

@@ -46 +46 @@
 
         // get command type and extended pointer on TXT device
-        uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.type ) );
-        xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.dev_xp ) );
+        uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.type ) );
+        xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
 
         // get TXT device cluster and local pointer
@@ -77 +77 @@
 
                 // get source buffer extended pointer & bytes count
-                uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.count ) );
-                xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.buf_xp ) );
+                uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.count ) );
+                xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.buf_xp ) );
 
                 // loop on characters