Renamed serial module to serial-line

This commit is contained in:
adamdunkels 2009-03-17 20:19:11 +00:00
parent a6be9a6d3c
commit b20f0884ed
5 changed files with 18 additions and 18 deletions

View file

@ -1,19 +1,19 @@
/* /*
* Copyright (c) 2007, Takahide Matsutsuka. * Copyright (c) 2007, Takahide Matsutsuka.
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions * modification, are permitted provided that the following conditions
* are met: * are met:
* 1. Redistributions of source code must retain the above copyright * 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer. * notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above * 2. Redistributions in binary form must reproduce the above
* copyright notice, this list of conditions and the following * copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided * disclaimer in the documentation and/or other materials provided
* with the distribution. * with the distribution.
* 3. The name of the author may not be used to endorse or promote * 3. The name of the author may not be used to endorse or promote
* products derived from this software without specific prior * products derived from this software without specific prior
* written permission. * written permission.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@ -25,9 +25,9 @@
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: rs232.c,v 1.4 2007/09/29 03:58:38 matsutsuka Exp $ * $Id: rs232.c,v 1.5 2009/03/17 20:20:45 adamdunkels Exp $
* *
*/ */
/* /*
@ -40,7 +40,7 @@
#include "contiki.h" #include "contiki.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "dev/serial.h" #include "dev/serial-line.h"
#include "dev/rs232.h" #include "dev/rs232.h"
PROCESS(rs232_process, "RS-232C polling process"); PROCESS(rs232_process, "RS-232C polling process");

View file

@ -50,7 +50,7 @@
#include "contiki-lib.h" #include "contiki-lib.h"
#include "dev/rs232.h" #include "dev/rs232.h"
#include "dev/serial.h" #include "dev/serial-line.h"
#include "dev/slip.h" #include "dev/slip.h"
#ifdef RAVEN_LCD_INTERFACE #ifdef RAVEN_LCD_INTERFACE
@ -59,7 +59,7 @@
#include "sicslowmac.h" #include "sicslowmac.h"
FUSES = FUSES =
{ {
.low = 0xe2, .low = 0xe2,
.high = 0x99, .high = 0x99,

View file

@ -48,7 +48,7 @@
#include "dev/rs232.h" #include "dev/rs232.h"
#include "dev/serial.h" #include "dev/serial-line.h"
#include "dev/slip.h" #include "dev/slip.h"
void init_lowlevel(void); void init_lowlevel(void);

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb-default-init-net.c,v 1.11 2008/03/13 15:59:43 nifi Exp $ * @(#)$Id: contiki-esb-default-init-net.c,v 1.12 2009/03/17 20:19:11 adamdunkels Exp $
*/ */
#include "contiki-esb.h" #include "contiki-esb.h"
@ -47,6 +47,6 @@ init_net(void)
rimeaddr.u8[1] = node_id >> 8; rimeaddr.u8[1] = node_id >> 8;
rimeaddr_set_node_addr(&rimeaddr); rimeaddr_set_node_addr(&rimeaddr);
rs232_set_input(serial_input_byte); rs232_set_input(serial_line_input_byte);
} }

View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: contiki-esb.h,v 1.4 2009/02/21 11:23:54 nifi Exp $ * @(#)$Id: contiki-esb.h,v 1.5 2009/03/17 20:19:11 adamdunkels Exp $
*/ */
#ifndef __CONTIKI_ESB_H__ #ifndef __CONTIKI_ESB_H__
#define __CONTIKI_ESB_H__ #define __CONTIKI_ESB_H__
@ -44,7 +44,7 @@
#include "dev/rs232.h" #include "dev/rs232.h"
#include "dev/serial.h" #include "dev/serial-line.h"
#include "dev/slip.h" #include "dev/slip.h"
#include "dev/tr1001.h" #include "dev/tr1001.h"
#include "net/tr1001-uip.h" #include "net/tr1001-uip.h"