RS232 support has been unified from just 'dumb' serial line and SLIP support.
This commit is contained in:
matsutsuka
parent
f553789fea
commit
4d6d5eb8ff
|
|
@ -1,85 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2007, Takahide Matsutsuka.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following
|
||||
* disclaimer in the documentation and/or other materials provided
|
||||
* with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: rs232-slip.c,v 1.1 2007/09/11 12:03:20 matsutsuka Exp $
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* \file
|
||||
* This is RS-232C SLIP process based on polling.
|
||||
* Note that rs232.c and rs232-slip.c cannot be used at the same time.
|
||||
* \author
|
||||
* Takahide Matsutsuka <markn@markn.org>
|
||||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "slip.h"
|
||||
#include "rs232.h"
|
||||
#include "rs232-slip.h"
|
||||
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void slip_arch_init(unsigned long ubr) {
|
||||
rs232_arch_init(ubr);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
void slip_arch_writeb(unsigned char c) {
|
||||
rs232_arch_writeb(c);
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS(rs232sl_process, "RS-232C SLIP polling process");
|
||||
/*---------------------------------------------------------------------------*/
|
||||
PROCESS_THREAD(rs232sl_process, ev, data)
|
||||
{
|
||||
static struct etimer timer;
|
||||
char ch;
|
||||
unsigned char i;
|
||||
PROCESS_BEGIN();
|
||||
|
||||
rs232_arch_init(RS232_BAUD_RATE);
|
||||
etimer_set(&timer, CLOCK_SECOND / 16);
|
||||
|
||||
while(1) {
|
||||
PROCESS_WAIT_EVENT();
|
||||
|
||||
if (etimer_expired(&timer)) {
|
||||
for (i = 0; i < RS232_BUFSIZE; i++) {
|
||||
ch = rs232_arch_poll();
|
||||
if (ch == 0) {
|
||||
break;
|
||||
}
|
||||
/* We have an input data */
|
||||
slip_input_byte(ch);
|
||||
}
|
||||
etimer_reset(&timer);
|
||||
}
|
||||
}
|
||||
|
||||
PROCESS_END();
|
||||
}
|
||||
/*---------------------------------------------------------------------------*/
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2007, Takahide Matsutsuka.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above
|
||||
* copyright notice, this list of conditions and the following
|
||||
* disclaimer in the documentation and/or other materials provided
|
||||
* with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
|
||||
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
|
||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
|
||||
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||||
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: rs232-slip.h,v 1.1 2007/09/11 12:03:20 matsutsuka Exp $
|
||||
*
|
||||
*/
|
||||
/*
|
||||
* \file
|
||||
* This is RS-232C process based on polling.
|
||||
* \author
|
||||
* Takahide Matsutsuka <markn@markn.org>
|
||||
*/
|
||||
|
||||
#ifndef __RS232_SLIP_H__
|
||||
#define __RS232_SLIP_H__
|
||||
|
||||
PROCESS_NAME(rs232sl_process);
|
||||
|
||||
#endif /* __RS232_SLIP_H__ */
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: rs232.c,v 1.3 2007/09/19 12:47:55 matsutsuka Exp $
|
||||
* $Id: rs232.c,v 1.4 2007/09/29 03:58:38 matsutsuka Exp $
|
||||
*
|
||||
*/
|
||||
/*
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
*/
|
||||
|
||||
#include "contiki.h"
|
||||
#include "dev/slip.h"
|
||||
#include "dev/serial.h"
|
||||
#include "dev/rs232.h"
|
||||
|
||||
|
|
@ -64,7 +65,7 @@ PROCESS_THREAD(rs232_process, ev, data)
|
|||
break;
|
||||
}
|
||||
/* We have an input data */
|
||||
serial_input_byte(ch);
|
||||
RS232_CALLBACK(ch);
|
||||
}
|
||||
etimer_reset(&timer);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: rs232.h,v 1.3 2007/09/19 12:47:55 matsutsuka Exp $
|
||||
* $Id: rs232.h,v 1.4 2007/09/29 03:58:38 matsutsuka Exp $
|
||||
*
|
||||
*/
|
||||
/*
|
||||
|
|
@ -58,10 +58,21 @@ unsigned char rs232_arch_poll(unsigned char* stat);
|
|||
/*
|
||||
* An architecture-depend implementation of RS-232C writing a byte.
|
||||
*/
|
||||
void rs232_arch_writeb(u8_t ch);
|
||||
void rs232_arch_writeb(unsigned char ch);
|
||||
|
||||
PROCESS_NAME(rs232_process);
|
||||
|
||||
/*
|
||||
* if you want to use simple serial communication,
|
||||
* define RS232_CONF_CALLBACK as serial_input_byte.
|
||||
* The default is SLIP.
|
||||
*/
|
||||
#ifdef RS232_CONF_CALLBACK
|
||||
#define RS232_CALLBACK RS232_CONF_CALLBACK
|
||||
#else /* RS232_CONF_CALLBACK */
|
||||
#define RS232_CALLBACK slip_input_byte
|
||||
#endif /* RS232_CONF_CALLBACK */
|
||||
|
||||
#ifdef RS232_CONF_BUFISZE
|
||||
#define RS232_BUFSIZE RS232_CONF_BUFISZE
|
||||
#else /* RS232_CONF_BUFISZE */
|
||||
|
|
|
|||
Loading…
Reference in a new issue