2006-06-17 22:41:10 +00:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2004, Swedish Institute of Computer Science.
|
|
|
|
* 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. Neither the name of the Institute nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
|
|
|
*
|
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``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 INSTITUTE OR CONTRIBUTORS 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.
|
|
|
|
*
|
|
|
|
* This file is part of the Contiki operating system.
|
|
|
|
*
|
|
|
|
* Author: Adam Dunkels <adam@sics.se>
|
|
|
|
*
|
2009-04-28 13:52:04 +00:00
|
|
|
* $Id: psock.c,v 1.8 2009/04/28 13:52:04 adamdunkels Exp $
|
2006-06-17 22:41:10 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
#include "net/psock.h"
|
|
|
|
|
|
|
|
#define STATE_NONE 0
|
|
|
|
#define STATE_ACKED 1
|
|
|
|
#define STATE_READ 2
|
|
|
|
#define STATE_BLOCKED_NEWDATA 3
|
|
|
|
#define STATE_BLOCKED_CLOSE 4
|
|
|
|
#define STATE_BLOCKED_SEND 5
|
|
|
|
#define STATE_DATA_SENT 6
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return value of the buffering functions that indicates that a
|
|
|
|
* buffer was not filled by incoming data.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#define BUF_NOT_FULL 0
|
|
|
|
#define BUF_NOT_FOUND 0
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return value of the buffering functions that indicates that a
|
|
|
|
* buffer was completely filled by incoming data.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#define BUF_FULL 1
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Return value of the buffering functions that indicates that an
|
|
|
|
* end-marker byte was found.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
#define BUF_FOUND 2
|
|
|
|
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
static void
|
|
|
|
buf_setup(struct psock_buf *buf,
|
|
|
|
u8_t *bufptr, u16_t bufsize)
|
|
|
|
{
|
|
|
|
buf->ptr = bufptr;
|
|
|
|
buf->left = bufsize;
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
static u8_t
|
|
|
|
buf_bufdata(struct psock_buf *buf, u16_t len,
|
|
|
|
u8_t **dataptr, u16_t *datalen)
|
|
|
|
{
|
|
|
|
if(*datalen < buf->left) {
|
|
|
|
memcpy(buf->ptr, *dataptr, *datalen);
|
|
|
|
buf->ptr += *datalen;
|
|
|
|
buf->left -= *datalen;
|
|
|
|
*dataptr += *datalen;
|
|
|
|
*datalen = 0;
|
|
|
|
return BUF_NOT_FULL;
|
|
|
|
} else if(*datalen == buf->left) {
|
|
|
|
memcpy(buf->ptr, *dataptr, *datalen);
|
|
|
|
buf->ptr += *datalen;
|
|
|
|
buf->left = 0;
|
|
|
|
*dataptr += *datalen;
|
|
|
|
*datalen = 0;
|
|
|
|
return BUF_FULL;
|
|
|
|
} else {
|
|
|
|
memcpy(buf->ptr, *dataptr, buf->left);
|
|
|
|
buf->ptr += buf->left;
|
|
|
|
*datalen -= buf->left;
|
|
|
|
*dataptr += buf->left;
|
|
|
|
buf->left = 0;
|
|
|
|
return BUF_FULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
static u8_t
|
Support for z80(sdcc) port.
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
|
|
|
buf_bufto(CC_REGISTER_ARG struct psock_buf *buf, u8_t endmarker,
|
|
|
|
CC_REGISTER_ARG u8_t **dataptr, CC_REGISTER_ARG u16_t *datalen)
|
2006-06-17 22:41:10 +00:00
|
|
|
{
|
|
|
|
u8_t c;
|
|
|
|
while(buf->left > 0 && *datalen > 0) {
|
|
|
|
c = *buf->ptr = **dataptr;
|
|
|
|
++*dataptr;
|
|
|
|
++buf->ptr;
|
|
|
|
--*datalen;
|
|
|
|
--buf->left;
|
|
|
|
|
|
|
|
if(c == endmarker) {
|
|
|
|
return BUF_FOUND;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(*datalen == 0) {
|
|
|
|
return BUF_NOT_FOUND;
|
|
|
|
}
|
|
|
|
|
|
|
|
while(*datalen > 0) {
|
|
|
|
c = **dataptr;
|
|
|
|
--*datalen;
|
|
|
|
++*dataptr;
|
|
|
|
|
|
|
|
if(c == endmarker) {
|
|
|
|
return BUF_FOUND | BUF_FULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return BUF_FULL;
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
static char
|
2008-10-31 18:10:24 +00:00
|
|
|
data_is_sent_and_acked(CC_REGISTER_ARG struct psock *s)
|
2006-06-17 22:41:10 +00:00
|
|
|
{
|
2008-10-31 18:10:24 +00:00
|
|
|
/* If data has previously been sent, and the data has been acked, we
|
|
|
|
increase the send pointer and call send_data() to send more
|
|
|
|
data. */
|
2006-06-17 22:41:10 +00:00
|
|
|
if(s->state != STATE_DATA_SENT || uip_rexmit()) {
|
|
|
|
if(s->sendlen > uip_mss()) {
|
|
|
|
uip_send(s->sendptr, uip_mss());
|
|
|
|
} else {
|
|
|
|
uip_send(s->sendptr, s->sendlen);
|
|
|
|
}
|
|
|
|
s->state = STATE_DATA_SENT;
|
2008-10-31 18:10:24 +00:00
|
|
|
return 0;
|
|
|
|
} else if(s->state == STATE_DATA_SENT && uip_acked()) {
|
2006-06-17 22:41:10 +00:00
|
|
|
if(s->sendlen > uip_mss()) {
|
|
|
|
s->sendlen -= uip_mss();
|
|
|
|
s->sendptr += uip_mss();
|
|
|
|
} else {
|
|
|
|
s->sendptr += s->sendlen;
|
|
|
|
s->sendlen = 0;
|
|
|
|
}
|
|
|
|
s->state = STATE_ACKED;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
2007-11-17 18:01:00 +00:00
|
|
|
PT_THREAD(psock_send(CC_REGISTER_ARG struct psock *s, const uint8_t *buf,
|
2006-06-17 22:41:10 +00:00
|
|
|
unsigned int len))
|
|
|
|
{
|
|
|
|
PT_BEGIN(&s->psockpt);
|
|
|
|
|
|
|
|
/* If there is no data to send, we exit immediately. */
|
|
|
|
if(len == 0) {
|
|
|
|
PT_EXIT(&s->psockpt);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Save the length of and a pointer to the data that is to be
|
|
|
|
sent. */
|
|
|
|
s->sendptr = buf;
|
|
|
|
s->sendlen = len;
|
|
|
|
|
|
|
|
s->state = STATE_NONE;
|
|
|
|
|
|
|
|
/* We loop here until all data is sent. The s->sendlen variable is
|
|
|
|
updated by the data_sent() function. */
|
|
|
|
while(s->sendlen > 0) {
|
|
|
|
|
|
|
|
/*
|
2008-10-31 18:10:24 +00:00
|
|
|
* The protothread will wait here until all data has been
|
|
|
|
* acknowledged and sent (data_is_acked_and_send() returns 1).
|
2006-06-17 22:41:10 +00:00
|
|
|
*/
|
2009-04-28 13:52:04 +00:00
|
|
|
PT_WAIT_UNTIL(&s->psockpt, data_is_sent_and_acked(s));
|
2006-06-17 22:41:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
s->state = STATE_NONE;
|
|
|
|
|
|
|
|
PT_END(&s->psockpt);
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
Support for z80(sdcc) port.
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
|
|
|
PT_THREAD(psock_generator_send(CC_REGISTER_ARG struct psock *s,
|
2006-06-17 22:41:10 +00:00
|
|
|
unsigned short (*generate)(void *), void *arg))
|
|
|
|
{
|
|
|
|
PT_BEGIN(&s->psockpt);
|
|
|
|
|
|
|
|
/* Ensure that there is a generator function to call. */
|
|
|
|
if(generate == NULL) {
|
|
|
|
PT_EXIT(&s->psockpt);
|
|
|
|
}
|
|
|
|
|
2008-10-31 18:10:24 +00:00
|
|
|
s->state = STATE_NONE;
|
2006-06-17 22:41:10 +00:00
|
|
|
do {
|
2008-10-31 18:10:24 +00:00
|
|
|
/* Call the generator function to generate the data in the
|
|
|
|
uip_appdata buffer. */
|
|
|
|
s->sendlen = generate(arg);
|
|
|
|
s->sendptr = uip_appdata;
|
|
|
|
|
|
|
|
if(s->sendlen > uip_mss()) {
|
|
|
|
uip_send(s->sendptr, uip_mss());
|
|
|
|
} else {
|
|
|
|
uip_send(s->sendptr, s->sendlen);
|
2006-06-17 22:41:10 +00:00
|
|
|
}
|
2008-10-31 18:10:24 +00:00
|
|
|
s->state = STATE_DATA_SENT;
|
|
|
|
|
2006-06-17 22:41:10 +00:00
|
|
|
/* Wait until all data is sent and acknowledged. */
|
2008-10-31 18:10:24 +00:00
|
|
|
PT_YIELD_UNTIL(&s->psockpt, uip_acked() || uip_rexmit());
|
|
|
|
} while(!uip_acked());
|
2006-06-17 22:41:10 +00:00
|
|
|
|
|
|
|
s->state = STATE_NONE;
|
|
|
|
|
|
|
|
PT_END(&s->psockpt);
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
u16_t
|
|
|
|
psock_datalen(struct psock *psock)
|
|
|
|
{
|
|
|
|
return psock->bufsize - psock->buf.left;
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
char
|
|
|
|
psock_newdata(struct psock *s)
|
|
|
|
{
|
|
|
|
if(s->readlen > 0) {
|
|
|
|
/* There is data in the uip_appdata buffer that has not yet been
|
|
|
|
read with the PSOCK_READ functions. */
|
|
|
|
return 1;
|
|
|
|
} else if(s->state == STATE_READ) {
|
|
|
|
/* All data in uip_appdata buffer already consumed. */
|
|
|
|
s->state = STATE_BLOCKED_NEWDATA;
|
|
|
|
return 0;
|
|
|
|
} else if(uip_newdata()) {
|
|
|
|
/* There is new data that has not been consumed. */
|
|
|
|
return 1;
|
|
|
|
} else {
|
|
|
|
/* There is no new data. */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
Support for z80(sdcc) port.
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
|
|
|
PT_THREAD(psock_readto(CC_REGISTER_ARG struct psock *psock, unsigned char c))
|
2006-06-17 22:41:10 +00:00
|
|
|
{
|
|
|
|
PT_BEGIN(&psock->psockpt);
|
|
|
|
|
|
|
|
buf_setup(&psock->buf, psock->bufptr, psock->bufsize);
|
|
|
|
|
|
|
|
/* XXX: Should add buf_checkmarker() before do{} loop, if
|
|
|
|
incoming data has been handled while waiting for a write. */
|
|
|
|
|
|
|
|
do {
|
|
|
|
if(psock->readlen == 0) {
|
|
|
|
PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock));
|
|
|
|
psock->state = STATE_READ;
|
|
|
|
psock->readptr = (u8_t *)uip_appdata;
|
|
|
|
psock->readlen = uip_datalen();
|
|
|
|
}
|
|
|
|
} while((buf_bufto(&psock->buf, c,
|
|
|
|
&psock->readptr,
|
|
|
|
&psock->readlen) & BUF_FOUND) == 0);
|
|
|
|
|
|
|
|
if(psock_datalen(psock) == 0) {
|
|
|
|
psock->state = STATE_NONE;
|
|
|
|
PT_RESTART(&psock->psockpt);
|
|
|
|
}
|
|
|
|
PT_END(&psock->psockpt);
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
Support for z80(sdcc) port.
In order to support, some core modules are modified as follows:
core/sys/dsc.h
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
- DSC_HEADER is changed to remove extra semicolon.
core/sys/process.h
- process_data_t is expressed by void* in signatures (known bug on sdcc).
core/sys/autostart.h
- autostart_processes is changed to remove extra semicolon.
core/sys/cc.h
- CC_CONF_ASSIGN_AGGREGATE is introduced.
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/net/hc.c
core/net/uip_arp.c
core/net/uaodv.c
- Aggregation assignments are changed to uip_ipaddr_copy.
core/net/psock.c
core/net/uipbuf.c
core/net/dhcpc.c
apps/shell/shell.c
core/ctk/vnc-server.c
core/ctk/vnc-out.c
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
core/net/uip-over-mesh.c
- An extra semicolon is removed.
apps/dhcp/dhcp-dsc.c
apps/shell/shell-dsc.
apps/ftp/ftp-dsc.c
apps/process-list/process-list-dsc.c
apps/email/email-dsc.c
apps/webserver/webserver-dsc.c
apps/vnc/vnc-dsc.c
apps/vnc/vnc-viewer.h
apps/webbrowser/www-dsc.c
apps/about/about-dsc.c
apps/irc/irc-dsc.c
apps/telnet/telnet-dsc.c
apps/telnetd/telnetd-dsc.c
apps/netconf/netconf-dsc.c
apps/directory/directory-dsc.c
pps/calc/calc-dsc.c
- Modify an extern type to a real declaration, which is static
to prevent a compile error.
core/net/mac/xmac.c
- Variables cannot be defined in a head of block on sdcc.
core/ctk/ctk.h
core/ctk/ctk.c
apps/program-handler/program-handler.c
- If CTK_CONF_ICONS is diabled, the whole icon-related code is disabled.
Makefile.include
- Add a set of configuration for an assembler.
- $(CLEAN) variable is introduced for customized cleanup.
apps/process-list/process-list.c
- PROCESSLIST_CONF_HEIGHT is introduced to address smaller screen size.
core/lib/ctk-filedialog.c
- FILES_CONF_HEIGHT is introduced to address smaller screen size.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/vnc/vnc-viewer.c
- A cast is added to prevent a compile error.
- "register" keyword in a signature cannot be used in sdcc,
CC_REGISTER_ARG is used instead.
apps/webbrowser/webclient.c
- CC_CONF_INC_CAST_POINTER is introduced, a workaround of a kind
of sdcc bug for an increment.
core/loader/elfloader.c
- A cast is added to prevent a compile error.
core/net/rime/rimeaddr.c
- An initialization is added to prevent a compile error.
core/net/rime/rudolph0.c
- NULL is changed to 0, because NULL causes a compile error.
core/net/rime/route-discovery.c
- Add an argument to match the definition of nf_callbacks.
cpu/z80/strcasecmp.h
cpu/z80/strcasecmp.c
cpu/z80/contiki-sdcc-conf.h
cpu/z80/mtarch.c
cpu/z80/mtarch.h
cpu/z80/Makefile.z80
- New files to make compilation availble on sdcc.
- Added support for multithreading.
2007-08-30 14:39:16 +00:00
|
|
|
PT_THREAD(psock_readbuf(CC_REGISTER_ARG struct psock *psock))
|
2006-06-17 22:41:10 +00:00
|
|
|
{
|
|
|
|
PT_BEGIN(&psock->psockpt);
|
|
|
|
|
|
|
|
buf_setup(&psock->buf, psock->bufptr, psock->bufsize);
|
|
|
|
|
|
|
|
/* XXX: Should add buf_checkmarker() before do{} loop, if
|
|
|
|
incoming data has been handled while waiting for a write. */
|
|
|
|
|
|
|
|
do {
|
|
|
|
if(psock->readlen == 0) {
|
|
|
|
PT_WAIT_UNTIL(&psock->psockpt, psock_newdata(psock));
|
|
|
|
psock->state = STATE_READ;
|
|
|
|
psock->readptr = (u8_t *)uip_appdata;
|
|
|
|
psock->readlen = uip_datalen();
|
|
|
|
}
|
|
|
|
} while(buf_bufdata(&psock->buf, psock->bufsize,
|
|
|
|
&psock->readptr,
|
|
|
|
&psock->readlen) != BUF_FULL);
|
|
|
|
|
|
|
|
if(psock_datalen(psock) == 0) {
|
|
|
|
psock->state = STATE_NONE;
|
|
|
|
PT_RESTART(&psock->psockpt);
|
|
|
|
}
|
|
|
|
PT_END(&psock->psockpt);
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|
|
|
|
void
|
2007-11-17 18:01:00 +00:00
|
|
|
psock_init(CC_REGISTER_ARG struct psock *psock,
|
|
|
|
uint8_t *buffer, unsigned int buffersize)
|
2006-06-17 22:41:10 +00:00
|
|
|
{
|
|
|
|
psock->state = STATE_NONE;
|
|
|
|
psock->readlen = 0;
|
|
|
|
psock->bufptr = buffer;
|
|
|
|
psock->bufsize = buffersize;
|
|
|
|
buf_setup(&psock->buf, buffer, buffersize);
|
|
|
|
PT_INIT(&psock->pt);
|
|
|
|
PT_INIT(&psock->psockpt);
|
|
|
|
}
|
|
|
|
/*---------------------------------------------------------------------------*/
|