deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Baud-rate has been added to the architecture-depend initialization.

Browse source 
Enabled packaged buffer reading.
This commit is contained in:
matsutsuka 2007-09-11 12:03:20 +00:00
parent d08097966d
commit cce43c2efc
4 changed files with 158 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

85
cpu/z80/dev/rs232-slip.c Normal file
View file

@ -0,0 +1,85 @@
/*
* 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();
}
/*---------------------------------------------------------------------------*/

45
cpu/z80/dev/rs232-slip.h Normal file
View file

@ -0,0 +1,45 @@
/*
* 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__ */

16
cpu/z80/dev/rs232.c
View file

@ -27,20 +27,20 @@
* 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.1 2007/09/09 13:41:15 matsutsuka Exp $ * $Id: rs232.c,v 1.2 2007/09/11 12:03:20 matsutsuka Exp $
* *
*/ */
/* /*
* \file * \file
* This is RS-232C process based on polling. * This is RS-232C process based on polling.
* Note that rs232.c and rs232-slip.c cannot be used at the same time.
* \author * \author
* Takahide Matsutsuka <markn@markn.org> * Takahide Matsutsuka <markn@markn.org>
*/ */
#include "contiki.h" #include "contiki.h"
#include "serial.h" #include "dev/serial.h"
#include "rs232.h" #include "dev/rs232.h"
#include "log.h"
PROCESS(rs232_process, "RS-232C polling process"); PROCESS(rs232_process, "RS-232C polling process");
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -48,17 +48,21 @@ PROCESS_THREAD(rs232_process, ev, data)
{ {
static struct etimer timer; static struct etimer timer;
char ch; char ch;
unsigned char i;
PROCESS_BEGIN(); PROCESS_BEGIN();
rs232_arch_init(); rs232_arch_init(RS232_BAUD_RATE);
etimer_set(&timer, CLOCK_SECOND / 16); etimer_set(&timer, CLOCK_SECOND / 16);
while(1) { while(1) {
PROCESS_WAIT_EVENT(); PROCESS_WAIT_EVENT();
if (etimer_expired(&timer)) { if (etimer_expired(&timer)) {
for (i = 0; i < RS232_BUFSIZE; i++) {
ch = rs232_arch_poll(); ch = rs232_arch_poll();
if (ch != 0) { if (ch == 0) {
break;
}
/* We have an input data */ /* We have an input data */
serial_input_byte(ch); serial_input_byte(ch);
} }

22
cpu/z80/dev/rs232.h
View file

@ -27,7 +27,7 @@
* 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.h,v 1.1 2007/09/09 13:41:15 matsutsuka Exp $ * $Id: rs232.h,v 1.2 2007/09/11 12:03:20 matsutsuka Exp $
* *
*/ */
/* /*
@ -37,8 +37,8 @@
* Takahide Matsutsuka <markn@markn.org> * Takahide Matsutsuka <markn@markn.org>
*/ */
#ifndef __RS_232C_H__ #ifndef __RS232_H__
#define __RS_232C_H__ #define __RS232_H__
/* /*
* Implement the following methods for each platform. * Implement the following methods for each platform.
@ -47,7 +47,7 @@
/* /*
* An architecture-depend implementation of RS-232C initialization. * An architecture-depend implementation of RS-232C initialization.
*/ */
void rs232_arch_init(void); void rs232_arch_init(unsigned long ubr);
/* /*
* An architecture-depend implementation of RS-232C polling. * An architecture-depend implementation of RS-232C polling.
@ -62,4 +62,16 @@ void rs232_arch_writeb(u8_t ch);
PROCESS_NAME(rs232_process); PROCESS_NAME(rs232_process);
#endif /* __RS_232C_H__ */ #ifdef RS232_CONF_BUFISZE
#define RS232_BUFSIZE RS232_CONF_BUFISZE
#else /* RS232_CONF_BUFISZE */
#define RS232_BUFSIZE 64
#endif /* RS232_CONF_BUFISZE */
#ifdef RS232_CONF_BAUD_RATE
#define RS232_BAUD_RATE RS232_CONF_BAUD_RATE
#else /* RS232_CONF_BAUD_RATE */
#define RS232_BAUD_RATE 9600
#endif /* RS232_CONF_BAUD_RATE */
#endif /* __RS232_H__ */