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

Fixed ugly function pointer cast by implementing a wrapper function for the protothread function.

Browse source
This commit is contained in:
adamdunkels 2009-02-24 21:27:43 +00:00
parent 9c024f19e0
commit d28bfe3f58
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/shell/shell-netfile.c
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: shell-netfile.c,v 1.6 2008/11/09 10:53:25 adamdunkels Exp $ * $Id: shell-netfile.c,v 1.7 2009/02/24 21:27:43 adamdunkels Exp $
*/ */
/** /**
@ -68,7 +68,7 @@ SHELL_COMMAND(recvnetfile_command,
&shell_recvnetfile_process); &shell_recvnetfile_process);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
static int static int
write_chunk(struct rudolph0_conn *c, int offset, int flag, write_chunk_pt(struct rudolph0_conn *c, int offset, int flag,
uint8_t *data, int datalen) uint8_t *data, int datalen)
{ {
PT_BEGIN(&recvnetfilept); PT_BEGIN(&recvnetfilept);
@ -96,6 +96,12 @@ write_chunk(struct rudolph0_conn *c, int offset, int flag,
PT_END(&recvnetfilept); PT_END(&recvnetfilept);
} }
static void
write_chunk(struct rudolph0_conn *c, int offset, int flag,
uint8_t *data, int datalen)
{
write_chunk_pt(c, offset, flag, data, datalen);
}
static int static int
read_chunk(struct rudolph0_conn *c, int offset, uint8_t *to, int maxsize) read_chunk(struct rudolph0_conn *c, int offset, uint8_t *to, int maxsize)
@ -112,7 +118,8 @@ read_chunk(struct rudolph0_conn *c, int offset, uint8_t *to, int maxsize)
return ret; return ret;
} }
CC_CONST_FUNCTION static struct rudolph0_callbacks rudolph0_callbacks = CC_CONST_FUNCTION static struct rudolph0_callbacks rudolph0_callbacks =
{(void (*)(struct rudolph0_conn *, int, int, uint8_t *, int))write_chunk, {/*(void (*)(struct rudolph0_conn *, int, int, uint8_t *, int))*/
write_chunk,
read_chunk}; read_chunk};
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
PROCESS_THREAD(shell_netfile_process, ev, data) PROCESS_THREAD(shell_netfile_process, ev, data)