Changeset 197

Timestamp:

Jul 13, 2017, 12:42:33 PM (7 years ago)

Author:

max@…

Message:

rename soclib->apic

Location:

trunk

Files:

• Makefile.x86 (modified) (1 diff)
• hal/x86_64/core/hal_drivers.c (modified) (2 diffs)
• hal/x86_64/drivers/pic_apic.c (moved) (moved from trunk/hal/x86_64/drivers/soclib_pic.c) (6 diffs)
• hal/x86_64/drivers/pic_apic.h (moved) (moved from trunk/hal/x86_64/drivers/soclib_pic.h) (2 diffs)

trunk/Makefile.x86

@@ -34 +34 @@
                build/kernel/drivers/soclib_mmc.o  \
                build/kernel/drivers/soclib_xcu.o  \
-               build/kernel/drivers/soclib_pic.o  \
+               build/kernel/drivers/pic_apic.o    \
                build/kernel/drivers/soclib_nic.o  \
                build/kernel/drivers/soclib_dma.o  \

trunk/hal/x86_64/core/hal_drivers.c

@@ -27 +27 @@
 #include <soclib_tty.h>
 #include <soclib_xcu.h>
-#include <soclib_pic.h>
+#include <pic_apic.h>
 
 void hal_drivers_txt_init(chdev_t *dev)
@@ -58 +58 @@
 {
         /* update the PIC chdev extension */
-        dev->ext.pic.enable_timer = &soclib_pic_enable_timer;
-        dev->ext.pic.enable_irq   = &soclib_pic_enable_irq;
-        dev->ext.pic.disable_irq  = &soclib_pic_disable_irq;
-        dev->ext.pic.bind_irq     = &soclib_pic_bind_irq;
-        dev->ext.pic.send_ipi     = &soclib_pic_send_ipi;
-        dev->ext.pic.extend_init  = &soclib_pic_extend_init;
+        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;
 }
 

trunk/hal/x86_64/drivers/pic_apic.c

@@ -1 +1 @@
 /*
- * soclib_pic.c - soclib PIC driver implementation.
+ * pic_apic.c - APIC PIC driver implementation
  *
- * Author  Alain Greiner (2016)
- * *
- * Copyright (c) UPMC Sorbonne Universites
+ * Copyright (c) 2017 Maxime Villard
  *
  * This file is part of ALMOS-MKH.
  *
- * ALMOS-MKH. is free software; you can redistribute it and/or modify it
+ * ALMOS-MKH is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by
  * the Free Software Foundation; version 2.0 of the License.
  *
- * ALMOS-MKH. is distributed in the hope that it will be useful, but
+ * ALMOS-MKH is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
@@ -18 +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
  */
@@ -24 +22 @@
 #include <hal_types.h>
 #include <chdev.h>
-#include <soclib_pic.h>
-#include <soclib_xcu.h>
+#include <pic_apic.h>
 #include <errno.h>
 #include <string.h>
 #include <vfs.h>
 
-void soclib_pic_init( chdev_t * pic )
+void pic_apic_init( chdev_t * pic )
 {
         x86_panic((char *)__func__);
 }
 
-void soclib_pic_extend_init( uint32_t * xcu_base )
+void pic_apic_extend_init( uint32_t * xcu_base )
 {
         x86_panic((char *)__func__);
 }
 
-void soclib_pic_bind_irq( lid_t     lid,
+void pic_apic_bind_irq( lid_t     lid,
                           chdev_t * src_chdev )
 {
@@ -46 +43 @@
 }
 
-void soclib_pic_enable_irq( lid_t     lid,
+void pic_apic_enable_irq( lid_t     lid,
                             chdev_t * src_chdev )
 {
@@ -52 +49 @@
 }
 
-void soclib_pic_disable_irq( lid_t     lid,
+void pic_apic_disable_irq( lid_t     lid,
                              chdev_t * src_chdev )
 {
@@ -58 +55 @@
 }
 
-void soclib_pic_enable_timer( uint32_t period )
+void pic_apic_enable_timer( uint32_t period )
 {
         x86_panic((char *)__func__);
 }
 
-void soclib_pic_send_ipi( cxy_t    cxy,
+void pic_apic_send_ipi( cxy_t    cxy,
                           lid_t    lid )
 {

trunk/hal/x86_64/drivers/pic_apic.h

@@ -1 +1 @@
 /*
- * soclib_pic.c - soclib PIC driver definition.
+ * pic_apic.c - APIC PIC driver definitions
  *
- * Author  Alain Greiner (2016)
- *
- * Copyright (c) UPMC Sorbonne Universites
+ * Copyright (c) 2017 Maxime Villard
  *
  * This file is part of ALMOS-MKH.
@@ -18 +16 @@
  *
  * You should have received a copy of the GNU General Public License
- * along with ALMOS-kernel; 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
  */
 
-#ifndef _SOCLIB_IOPIC_H_
-#define _SOCLIB_IOPIC_H_
+#ifndef _PIC_APIC_H_
+#define _PIC_APIC_H_
 
 #include <hal_types.h>
 
-void soclib_pic_init( chdev_t * pic );
-void soclib_pic_extend_init( uint32_t * xcu_base );
-void soclib_pic_bind_irq( 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 soclib_pic_enable_irq( lid_t     lid,
+void pic_apic_enable_irq( lid_t     lid,
                             chdev_t * src_chdev );
-void soclib_pic_disable_irq( lid_t     lid,
+void pic_apic_disable_irq( lid_t     lid,
                              chdev_t * src_chdev );
-void soclib_pic_enable_timer( uint32_t period );
+void pic_apic_enable_timer( uint32_t period );
 
-void soclib_pic_send_ipi( cxy_t    cxy,
+void pic_apic_send_ipi( cxy_t    cxy,
                           lid_t    lid );
 
-#endif  /* _SOCLIB_IOPIC_H_ */
+#endif  /* _PIC_APIC_H_ */