Changeset 197 for trunk/hal


Ignore:
Timestamp:
Jul 13, 2017, 12:42:33 PM (7 years ago)
Author:
max@…
Message:

rename soclib->apic

Location:
trunk/hal/x86_64
Files:
1 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/hal/x86_64/core/hal_drivers.c

    r196 r197  
    2727#include <soclib_tty.h>
    2828#include <soclib_xcu.h>
    29 #include <soclib_pic.h>
     29#include <pic_apic.h>
    3030
    3131void hal_drivers_txt_init(chdev_t *dev)
    … …  
    5858{
    5959        /* update the PIC chdev extension */
    60         dev->ext.pic.enable_timer = &soclib_pic_enable_timer;
    61         dev->ext.pic.enable_irq   = &soclib_pic_enable_irq;
    62         dev->ext.pic.disable_irq  = &soclib_pic_disable_irq;
    63         dev->ext.pic.bind_irq     = &soclib_pic_bind_irq;
    64         dev->ext.pic.send_ipi     = &soclib_pic_send_ipi;
    65         dev->ext.pic.extend_init  = &soclib_pic_extend_init;
     60        dev->ext.pic.enable_timer = &pic_apic_enable_timer;
     61        dev->ext.pic.enable_irq   = &pic_apic_enable_irq;
     62        dev->ext.pic.disable_irq  = &pic_apic_disable_irq;
     63        dev->ext.pic.bind_irq     = &pic_apic_bind_irq;
     64        dev->ext.pic.send_ipi     = &pic_apic_send_ipi;
     65        dev->ext.pic.extend_init  = &pic_apic_extend_init;
    6666}
    6767

  • trunk/hal/x86_64/drivers/pic_apic.c

    r196 r197  
    11/*
    2  * soclib_pic.c - soclib PIC driver implementation.
     2 * pic_apic.c - APIC PIC driver implementation
    33 *
    4  * Author  Alain Greiner (2016)
    5  * *
    6  * Copyright (c) UPMC Sorbonne Universites
     4 * Copyright (c) 2017 Maxime Villard
    75 *
    86 * This file is part of ALMOS-MKH.
    97 *
    10  * ALMOS-MKH. is free software; you can redistribute it and/or modify it
     8 * ALMOS-MKH is free software; you can redistribute it and/or modify it
    119 * under the terms of the GNU General Public License as published by
    1210 * the Free Software Foundation; version 2.0 of the License.
    1311 *
    14  * ALMOS-MKH. is distributed in the hope that it will be useful, but
     12 * ALMOS-MKH is distributed in the hope that it will be useful, but
    1513 * WITHOUT ANY WARRANTY; without even the implied warranty of
    1614 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    … …  
    1816 *
    1917 * You should have received a copy of the GNU General Public License
    20  * along with ALMOS-MKH.; if not, write to the Free Software Foundation,
     18 * along with ALMOS-MKH; if not, write to the Free Software Foundation,
    2119 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2220 */
    … …  
    2422#include <hal_types.h>
    2523#include <chdev.h>
    26 #include <soclib_pic.h>
    27 #include <soclib_xcu.h>
     24#include <pic_apic.h>
    2825#include <errno.h>
    2926#include <string.h>
    3027#include <vfs.h>
    3128
    32 void soclib_pic_init( chdev_t * pic )
     29void pic_apic_init( chdev_t * pic )
    3330{
    3431        x86_panic((char *)__func__);
    3532}
    3633
    37 void soclib_pic_extend_init( uint32_t * xcu_base )
     34void pic_apic_extend_init( uint32_t * xcu_base )
    3835{
    3936        x86_panic((char *)__func__);
    4037}
    4138
    42 void soclib_pic_bind_irq( lid_t     lid,
     39void pic_apic_bind_irq( lid_t     lid,
    4340                          chdev_t * src_chdev )
    4441{
    … …  
    4643}
    4744
    48 void soclib_pic_enable_irq( lid_t     lid,
     45void pic_apic_enable_irq( lid_t     lid,
    4946                            chdev_t * src_chdev )
    5047{
    … …  
    5249}
    5350
    54 void soclib_pic_disable_irq( lid_t     lid,
     51void pic_apic_disable_irq( lid_t     lid,
    5552                             chdev_t * src_chdev )
    5653{
    … …  
    5855}
    5956
    60 void soclib_pic_enable_timer( uint32_t period )
     57void pic_apic_enable_timer( uint32_t period )
    6158{
    6259        x86_panic((char *)__func__);
    6360}
    6461
    65 void soclib_pic_send_ipi( cxy_t    cxy,
     62void pic_apic_send_ipi( cxy_t    cxy,
    6663                          lid_t    lid )
    6764{

  • trunk/hal/x86_64/drivers/pic_apic.h

    r196 r197  
    11/*
    2  * soclib_pic.c - soclib PIC driver definition.
     2 * pic_apic.c - APIC PIC driver definitions
    33 *
    4  * Author  Alain Greiner (2016)
    5  *
    6  * Copyright (c) UPMC Sorbonne Universites
     4 * Copyright (c) 2017 Maxime Villard
    75 *
    86 * This file is part of ALMOS-MKH.
    … …  
    1816 *
    1917 * You should have received a copy of the GNU General Public License
    20  * along with ALMOS-kernel; if not, write to the Free Software Foundation,
     18 * along with ALMOS-MKH; if not, write to the Free Software Foundation,
    2119 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
    2220 */
    2321
    24 #ifndef _SOCLIB_IOPIC_H_
    25 #define _SOCLIB_IOPIC_H_
     22#ifndef _PIC_APIC_H_
     23#define _PIC_APIC_H_
    2624
    2725#include <hal_types.h>
    2826
    29 void soclib_pic_init( chdev_t * pic );
    30 void soclib_pic_extend_init( uint32_t * xcu_base );
    31 void soclib_pic_bind_irq( 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,
    3230                          chdev_t * src_chdev );
    33 void soclib_pic_enable_irq( lid_t     lid,
     31void pic_apic_enable_irq( lid_t     lid,
    3432                            chdev_t * src_chdev );
    35 void soclib_pic_disable_irq( lid_t     lid,
     33void pic_apic_disable_irq( lid_t     lid,
    3634                             chdev_t * src_chdev );
    37 void soclib_pic_enable_timer( uint32_t period );
     35void pic_apic_enable_timer( uint32_t period );
    3836
    39 void soclib_pic_send_ipi( cxy_t    cxy,
     37void pic_apic_send_ipi( cxy_t    cxy,
    4038                          lid_t    lid );
    4139
    42 #endif  /* _SOCLIB_IOPIC_H_ */
     40#endif  /* _PIC_APIC_H_ */
Note: See TracChangeset for help on using the changeset viewer.