nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Filename changes needed by ZDS archiver

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1452 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-12-12 18:33:36 +00:00
parent 703a3b1e88
commit bb45db5b2e
34 changed files with 80 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
net/Makefile
View file

@ -38,7 +38,7 @@
ifeq ($(CONFIG_NET),y)
SOCK_ASRCS =
SOCK_CSRCS = socket.c bind.c connect.c sendto.c recv.c recvfrom.c \
net-sockets.c net-close.c
net_sockets.c net_close.c
ifeq ($(CONFIG_NET_TCP),y)
SOCK_CSRCS += send.c listen.c accept.c
@ -47,14 +47,14 @@ endif
ifeq ($(CONFIG_NET_SOCKOPTS),y)
SOCK_CSRCS += setsockopt.c getsockopt.c
ifneq ($(CONFIG_DISABLE_CLOCK),y)
SOCK_CSRCS += net-timeo.c net-dsec2timeval.c net-timeval2dsec.c net-arptimer.c
SOCK_CSRCS += net_timeo.c net_dsec2timeval.c net_timeval2dsec.c net_arptimer.c
endif
endif
NETDEV_ASRCS =
NETDEV_CSRCS = netdev-register.c netdev-ioctl.c net-poll.c netdev-txnotify.c \
netdev-findbyname.c netdev-findbyaddr.c netdev-count.c \
netdev-foreach.c
NETDEV_CSRCS = netdev_register.c netdev_ioctl.c net_poll.c netdev_txnotify.c \
netdev_findbyname.c netdev_findbyaddr.c netdev_count.c \
netdev_foreach.c
include uip/Make.defs
endif

2
net/accept.c
View file

@ -50,7 +50,7 @@
#include <arch/irq.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

4
net/bind.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/bind.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -44,7 +44,7 @@
#include <sys/socket.h>
#include <errno.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

4
net/connect.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/connect.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <arch/irq.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
#include "uip/uip-internal.h"
/****************************************************************************

4
net/getsockopt.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/getsockopt.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -44,7 +44,7 @@
#include <sys/socket.h>
#include <errno.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

4
net/listen.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/listen.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -44,7 +44,7 @@
#include <sys/socket.h>
#include <errno.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

6
net/net-arptimer.c → net/net_arptimer.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/net-arptimer.c
* net/net_arptimer.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -46,7 +46,7 @@
#include <net/uip/uip-arp.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/net-close.c → net/net_close.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/net-close.c
* net/net_close.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -49,7 +49,7 @@
#include <arch/irq.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
#include "uip/uip-internal.h"
/****************************************************************************

6
net/net-dsec2timeval.c → net/net_dsec2timeval.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/net-dsec2timeval.c
* net/net_dsec2timeval.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <errno.h>
#include <nuttx/clock.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

2
net/net-internal.h → net/net_internal.h
View file

@ -47,8 +47,6 @@
#include <nuttx/net.h>
#include <net/uip/uip.h>
#include "net-internal.h"
/****************************************************************************
* Definitions
****************************************************************************/

4
net/net-poll.c → net/net_poll.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* net/net-poll.c
* net/net_poll.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -54,7 +54,7 @@
#include <uip/uip-internal.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Pre-processor Definitions

4
net/net-sockets.c → net/net_sockets.c
View file

@ -1,5 +1,5 @@
/****************************************************************************
* net-sockets.c
* net_sockets.c
*
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -51,7 +51,7 @@
#include <nuttx/net.h>
#include <nuttx/kmalloc.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/net-timeo.c → net/net_timeo.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/net-timeo.c
* net/net_timeo.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <nuttx/clock.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

6
net/net-timeval2dsec.c → net/net_timeval2dsec.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/net-timeval2dsec.c
* net/net_timeval2dsec.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <errno.h>
#include <nuttx/clock.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

6
net/netdev-count.c → net/netdev_count.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-count.c
* net/netdev_count.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -46,7 +46,7 @@
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-findbyaddr.c → net/netdev_findbyaddr.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-findbyaddr.c
* net/netdev_findbyaddr.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -47,7 +47,7 @@
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-findbyname.c → net/netdev_findbyname.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-findbyname.c
* net/netdev_findbyname.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -46,7 +46,7 @@
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-foreach.c → net/netdev_foreach.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-foreach.c
* net/netdev_foreach.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <nuttx/net.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-ioctl.c → net/netdev_ioctl.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-ioctl.c
* net/netdev_ioctl.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -55,7 +55,7 @@
#include <net/uip/uip-arch.h>
#include <net/uip/uip.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-register.c → net/netdev_register.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-register.c
* net/netdev_register.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -53,7 +53,7 @@
#include <net/ethernet.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

6
net/netdev-txnotify.c → net/netdev_txnotify.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/netdev-txnotify.c
* net/netdev_txnotify.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -47,7 +47,7 @@
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Definitions

4
net/recv.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/recv.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -44,7 +44,7 @@
#include <sys/socket.h>
#include <errno.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

2
net/recvfrom.c
View file

@ -51,7 +51,7 @@
#include <nuttx/clock.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
#include "uip/uip-internal.h"
/****************************************************************************

2
net/send.c
View file

@ -51,7 +51,7 @@
#include <nuttx/clock.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
#include "uip/uip-internal.h"
/****************************************************************************

2
net/sendto.c
View file

@ -48,7 +48,7 @@
#include <arch/irq.h>
#include <net/uip/uip-arch.h>
#include "net-internal.h"
#include "net_internal.h"
#include "uip/uip-internal.h"
/****************************************************************************

4
net/setsockopt.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/setsockopt.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <errno.h>
#include <arch/irq.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

4
net/socket.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* net/socket.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Redistribution and use in source and binary forms, with or without
@ -45,7 +45,7 @@
#include <errno.h>
#include <debug.h>
#include "net-internal.h"
#include "net_internal.h"
/****************************************************************************
* Global Functions

2
netutils/webserver/Make.defs
View file

@ -34,4 +34,4 @@
############################################################################
WEBSERVER_ASRCS =
WEBSERVER_CSRCS = httpd.c httpd-fs.c httpd-cgi.c
WEBSERVER_CSRCS = httpd.c httpd_fs.c httpd_cgi.c

2
netutils/webserver/httpd.c
View file

@ -62,7 +62,7 @@
#include <net/uip/httpd.h>
#include "httpd.h"
#include "httpd-cgi.h"
#include "httpd_cgi.h"
/****************************************************************************
* Definitions

4
netutils/webserver/httpd-cgi.c → netutils/webserver/httpd_cgi.c
View file

@ -1,4 +1,4 @@
/* httpd-cgi.c
/* httpd_cgi.c
* Web server script interface
* Author: Adam Dunkels <adam@sics.se>
*
@ -39,7 +39,7 @@
#include <net/uip/uip.h>
#include <net/uip/httpd.h>
#include "httpd-cgi.h"
#include "httpd_cgi.h"
#define CONFIG_HTTPDCGI_FILESTATS 1
#undef CONFIG_HTTPDCGI_DCPSTATS

2
netutils/webserver/httpd-cgi.h → netutils/webserver/httpd_cgi.h
View file

@ -1,4 +1,4 @@
/* httpd-cgi.h
/* httpd_cgi.h
* Web server script interface header file
* Author: Adam Dunkels <adam@sics.se>
*

8
netutils/webserver/httpd-fs.c → netutils/webserver/httpd_fs.c
View file

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/webserver/httpd-fs.c
* netutils/webserver/httpd_fs.c
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -46,13 +46,13 @@
#include <net/uip/httpd.h>
#include "httpd.h"
#include "httpd-fsdata.h"
#include "httpd_fsdata.h"
#ifndef NULL
#define NULL 0
#endif /* NULL */
#include "httpd-fsdata.c"
#include "httpd_fsdata.c"
#if HTTPD_FS_STATISTICS
static uint16 count[HTTPD_FS_NUMFILES];

0
netutils/webserver/httpd-fsdata.c → netutils/webserver/httpd_fsdata.c
View file

16
netutils/webserver/httpd-fsdata.h → netutils/webserver/httpd_fsdata.h
View file

@ -1,7 +1,7 @@
/****************************************************************************
* netutils/webserver/httpd-fsdata.h
* netutils/webserver/httpd_fsdata.h
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* Based on uIP which also has a BSD style license:
@ -53,9 +53,9 @@
struct httpd_fsdata_file
{
const struct httpd_fsdata_file *next;
const unsigned char *name;
const unsigned char *data;
const int len;
FAR const ubyte *name;
FAR const ubyte *data;
int len;
#ifdef HTTPD_FS_STATISTICS
#if HTTPD_FS_STATISTICS == 1
uint16 count;
@ -65,9 +65,9 @@ struct httpd_fsdata_file
struct httpd_fsdata_file_noconst
{
struct httpd_fsdata_file *next;
char *name;
char *data;
FAR struct httpd_fsdata_file *next;
FAR char *name;
FAR char *data;
int len;
#ifdef HTTPD_FS_STATISTICS
#if HTTPD_FS_STATISTICS == 1