Changeset 247 for trunk/hal/x86_64/drivers/txt_rs232.c

Timestamp:

Jul 20, 2017, 1:04:15 PM (7 years ago)

Author:

max@…

Message:

Rename soclib_tty->txt_rs232.

File:

• trunk/hal/x86_64/drivers/txt_rs232.c (moved) (moved from trunk/hal/x86_64/drivers/soclib_tty.c) (7 diffs)

trunk/hal/x86_64/drivers/txt_rs232.c

@@ -1 +1 @@
 /*
- * soclib_tty.c - soclib tty driver implementation.
+ * txt_rs232.c - RS232 driver implementation
  *
- * Author  Alain Greiner (2016)
+ * Copyright (c) 2017 Maxime Villard
  *
- * Copyright (c)  UPMC Sorbonne Universites
+ * This file is part of ALMOS-MKH.
  *
- * 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 <dev_txt.h>
 #include <chdev.h>
-#include <soclib_tty.h>
+#include <txt_rs232.h>
 #include <remote_spinlock.h>
 #include <thread.h>
@@ -31 +29 @@
 #include <hal_internal.h> // XXX
 
-void soclib_tty_init( chdev_t * chdev )
+void txt_rs232_init(chdev_t *chdev)
 {
-        chdev->cmd = &soclib_tty_cmd;
-        chdev->isr = &soclib_tty_isr;
+        chdev->cmd = &txt_rs232_cmd;
+        chdev->isr = &txt_rs232_isr;
 
         // nothing to do
@@ -41 +39 @@
 // Pour le write: tout en sync, ça part direct sur le VGA/série
 // Pour le read: là on attend l'ISR
-void __attribute__ ((noinline)) soclib_tty_cmd( xptr_t th_xp )
+void txt_rs232_cmd(xptr_t th_xp)
 {
         // get client thread cluster and local pointer
@@ -55 +53 @@
         chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
 
-        // get extended pointer on SOCLIB_TTY base segment
+        // get extended pointer on base segment
         xptr_t tty_xp = (xptr_t)hal_remote_lwd( XPTR( dev_cxy , &dev_ptr->base ) );
 
-        // get SOCLIB_TTY base segment cluster and local pointer
+        // get base segment cluster and local pointer
         cxy_t      tty_cxy = GET_CXY( tty_xp );
         uint32_t * tty_ptr = (uint32_t *)GET_PTR( tty_xp );
@@ -94 +92 @@
 }
 
-void __attribute__ ((noinline)) soclib_tty_isr( chdev_t * chdev )
+void txt_rs232_isr(chdev_t *chdev)
 {
         // Cette ISR est juste utile pour le clavier; on arrive ici quand une touche
         // est pressée
-        x86_panic("soclib_tty_isr not handled");
+        x86_panic("txt_rs232_isr not handled");
 }