Ignore:
Timestamp:
Jul 20, 2017, 1:04:15 PM (5 years ago)
Author:
max@…
Message:

Rename soclib_tty->txt_rs232.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/hal/x86_64/drivers/txt_rs232.c

    r244 r247  
    11/*
    2  * soclib_tty.c - soclib tty driver implementation.
     2 * txt_rs232.c - RS232 driver implementation
    33 *
    4  * Author  Alain Greiner (2016)
     4 * Copyright (c) 2017 Maxime Villard
    55 *
    6  * Copyright (c)  UPMC Sorbonne Universites
     6 * This file is part of ALMOS-MKH.
    77 *
    8  * This file is part of ALMOS-MKH..
    9  *
    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 <dev_txt.h>
    2523#include <chdev.h>
    26 #include <soclib_tty.h>
     24#include <txt_rs232.h>
    2725#include <remote_spinlock.h>
    2826#include <thread.h>
     
    3129#include <hal_internal.h> // XXX
    3230
    33 void soclib_tty_init( chdev_t * chdev )
     31void txt_rs232_init(chdev_t *chdev)
    3432{
    35         chdev->cmd = &soclib_tty_cmd;
    36         chdev->isr = &soclib_tty_isr;
     33        chdev->cmd = &txt_rs232_cmd;
     34        chdev->isr = &txt_rs232_isr;
    3735
    3836        // nothing to do
     
    4139// Pour le write: tout en sync, ça part direct sur le VGA/série
    4240// Pour le read: là on attend l'ISR
    43 void __attribute__ ((noinline)) soclib_tty_cmd( xptr_t th_xp )
     41void txt_rs232_cmd(xptr_t th_xp)
    4442{
    4543        // get client thread cluster and local pointer
     
    5553        chdev_t * dev_ptr = (chdev_t *)GET_PTR( dev_xp );
    5654
    57         // get extended pointer on SOCLIB_TTY base segment
     55        // get extended pointer on base segment
    5856        xptr_t tty_xp = (xptr_t)hal_remote_lwd( XPTR( dev_cxy , &dev_ptr->base ) );
    5957
    60         // get SOCLIB_TTY base segment cluster and local pointer
     58        // get base segment cluster and local pointer
    6159        cxy_t      tty_cxy = GET_CXY( tty_xp );
    6260        uint32_t * tty_ptr = (uint32_t *)GET_PTR( tty_xp );
     
    9492}
    9593
    96 void __attribute__ ((noinline)) soclib_tty_isr( chdev_t * chdev )
     94void txt_rs232_isr(chdev_t *chdev)
    9795{
    9896        // Cette ISR est juste utile pour le clavier; on arrive ici quand une touche
    9997        // est pressée
    100         x86_panic("soclib_tty_isr not handled");
     98        x86_panic("txt_rs232_isr not handled");
    10199}
    102100
Note: See TracChangeset for help on using the changeset viewer.