Changeset 280 for trunk/hal


Ignore:
Timestamp:
Jul 27, 2017, 10:21:51 AM (4 years ago)
Author:
max@…
Message:

sync

Location:
trunk/hal/x86_64
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/core/hal_drivers.c

    r261 r280  
    5050        /* update the PIC chdev extension */
    5151        pic->ext.pic.enable_timer = &pic_apic_enable_timer;
     52        pic->ext.pic.enable_ipi   = &pic_apic_enable_ipi;
    5253        pic->ext.pic.enable_irq   = &pic_apic_enable_irq;
    5354        pic->ext.pic.disable_irq  = &pic_apic_disable_irq;
  • trunk/hal/x86_64/core/hal_special.c

    r234 r280  
    5151{
    5252        return rdtsc();
     53}
     54
     55inline reg_t hal_get_sr()
     56{
     57        return 0;
    5358}
    5459
  • trunk/hal/x86_64/drivers/ioc_ata.c

    r269 r280  
    208208
    209209        // get command arguments and extended pointer on IOC device
    210         cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.type   ) );
    211         lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.lba    ) );
    212         count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.ioc.count  ) );
    213         buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.ioc.buf_xp ) );
     210        cmd_type =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.type   ) );
     211        lba      =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.lba    ) );
     212        count    =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->ioc_cmd.count  ) );
     213        buf_xp   = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->ioc_cmd.buf_xp ) );
    214214
    215215        /* execute operation */
  • trunk/hal/x86_64/drivers/pic_apic.c

    r208 r280  
    141141}
    142142
     143void pic_apic_enable_ipi()
     144{
     145        x86_panic((char *)__func__);
     146}
     147
    143148void pic_apic_send_ipi(cxy_t cxy, lid_t lid)
    144149{
  • trunk/hal/x86_64/drivers/pic_apic.h

    r208 r280  
    2525#include <hal_types.h>
    2626
    27 void pic_apic_init( chdev_t * pic );
    28 void pic_apic_extend_init( uint32_t * xcu_base );
    29 void pic_apic_bind_irq( lid_t     lid,
    30                         chdev_t * src_chdev );
    31 void pic_apic_enable_irq( lid_t   lid,
    32                           xptr_t  src_chdev_xp );
    33 void pic_apic_disable_irq( lid_t   lid,
    34                            xptr_t  src_chdev_xp );
    35 void pic_apic_enable_timer( uint32_t period );
    36 
    37 void pic_apic_send_ipi( cxy_t    cxy,
    38                         lid_t    lid );
     27void pic_apic_init(chdev_t *pic);
     28void pic_apic_extend_init(uint32_t *xcu_base);
     29void pic_apic_bind_irq(lid_t lid, chdev_t *src_chdev);
     30void pic_apic_enable_irq(lid_t lid, xptr_t src_chdev_xp);
     31void pic_apic_disable_irq(lid_t lid, xptr_t src_chdev_xp);
     32void pic_apic_enable_timer(uint32_t period);
     33void pic_apic_enable_ipi();
     34void pic_apic_send_ipi(cxy_t cxy, lid_t lid);
    3935
    4036#endif  /* _PIC_APIC_H_ */
  • trunk/hal/x86_64/drivers/txt_rs232.c

    r247 r280  
    4646
    4747        // get command type and extended pointer on TXT device
    48         uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.type ) );
    49         xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.dev_xp ) );
     48        uint32_t type   =         hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.type ) );
     49        xptr_t   dev_xp = (xptr_t)hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.dev_xp ) );
    5050
    5151        // get TXT device cluster and local pointer
     
    7777
    7878                // get source buffer extended pointer & bytes count
    79                 uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->command.txt.count ) );
    80                 xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->command.txt.buf_xp ) );
     79                uint32_t count  = hal_remote_lw ( XPTR( th_cxy , &th_ptr->txt_cmd.count ) );
     80                xptr_t   buf_xp = hal_remote_lwd( XPTR( th_cxy , &th_ptr->txt_cmd.buf_xp ) );
    8181
    8282                // loop on characters
Note: See TracChangeset for help on using the changeset viewer.