sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added network init; refactored some header files

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@338 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2007-09-09 11:58:50 +00:00
parent 4283c46855
commit 01207cc66e
39 changed files with 208 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/pjrc-8051/src/up_allocateheap.c
View File

@ -42,6 +42,7 @@
#include <sched.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/mm.h>
#include "os_internal.h"
#include "up_internal.h"
#include "up_mem.h"

2
arch/sim/src/up_head.c
View File

@ -42,7 +42,7 @@
#include <stdlib.h>
#include <setjmp.h>
#include <assert.h>
#include <nuttx/os_external.h>
#include <nuttx/init.h>
#include <nuttx/arch.h>
/************************************************************

2
configs/ntosd-dm320/defconfig
View File

@ -268,7 +268,7 @@ CONFIG_PREALLOC_TIMERS=8
# CONFIG_NET_LLH_LEN - The link level header length
# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
CONFIG_NET=y
CONFIG_NET=n
CONFIG_NET_IPv6=n
CONFIG_NSOCKET_DESCRIPTORS=0
CONFIG_NET_MAX_CONNECTIONS=40

2
configs/pjrc-8051/defconfig
View File

@ -256,7 +256,7 @@ CONFIG_PREALLOC_TIMERS=0
# CONFIG_NET_LLH_LEN - The link level header length
# CONFIG_NET_EXTERNAL_BUFFER - Incoming packet buffer (uip_buf) is defined externally
# CONFIG_NET_FWCACHE_SIZE - number of packets to remember when looking for duplicates
CONFIG_NET=y
CONFIG_NET=n
CONFIG_NET_IPv6=n
CONFIG_NSOCKET_DESCRIPTORS=0
CONFIG_NET_MAX_CONNECTIONS=40

1
examples/ostest/dev_null.c
View File

@ -45,7 +45,6 @@
#include <stdio.h>
#include <unistd.h>
#include <fcntl.h>
#include <nuttx/os_external.h>
#include "ostest.h"
/************************************************************

2
examples/ostest/main.c
View File

@ -47,7 +47,7 @@
#include <unistd.h>
#include <string.h>
#include <sched.h>
#include <nuttx/os_external.h>
#include <nuttx/init.h>
#include "ostest.h"
/************************************************************

29
include/nuttx/os_external.h → include/nuttx/clock.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
* os_external.h
* nuttx/clock.h
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@ -33,16 +33,14 @@
*
****************************************************************************/
#ifndef __OS_EXTERNAL_H
#define __OS_EXTERNAL_H
#ifndef __NUTTX_CLOCK_H
#define __NUTTX_CLOCK_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <pthread.h>
#include <nuttx/compiler.h>
/****************************************************************************
* Definitions
@ -115,28 +113,9 @@ extern "C" {
#define EXTERN extern
#endif
/* These are functions that must be supplied by the application */
EXTERN void weak_function user_initialize(void);
EXTERN int user_start(int argc, char *argv[]);
/* Functions contained in os_task.c *****************************************/
EXTERN void os_start(void); /* OS entry point called by boot logic */
/* Functions contained in mm_initialize.c ***********************************/
EXTERN void mm_initialize(FAR void *heap_start, size_t heap_size);
EXTERN void mm_addregion(FAR void *heapstart, size_t heapsize);
/* Functions contained in mm_sem.c ******************************************/
EXTERN int mm_trysemaphore(void);
EXTERN void mm_givesemaphore(void);
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __OS_EXTERNAL_H */
#endif /* __NUTTX_CLOCK_H */

83
include/nuttx/init.h Normal file
View File

@ -0,0 +1,83 @@
/****************************************************************************
* nuttx/init.h
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* 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 Gregory Nutt 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 COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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.
*
****************************************************************************/
#ifndef __NUTTX_INIT_H
#define __NUTTX_INIT_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <nuttx/compiler.h>
/****************************************************************************
* Definitions
****************************************************************************/
/****************************************************************************
* Global Data
****************************************************************************/
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
#else
#define EXTERN extern
#endif
/* These are functions that must be supplied by the application */
EXTERN void weak_function user_initialize(void);
EXTERN int user_start(int argc, char *argv[]);
/* Functions contained in os_task.c *****************************************/
EXTERN void os_start(void); /* OS entry point called by boot logic */
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __NUTTX_INIT_H */

83
include/nuttx/mm.h Normal file
View File

@ -0,0 +1,83 @@
/****************************************************************************
* nuttx/mm.h
*
* Copyright (C) 2007 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <spudmonkey@racsa.co.cr>
*
* 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 Gregory Nutt 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 COPYRIGHT HOLDERS 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
* COPYRIGHT OWNER 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.
*
****************************************************************************/
#ifndef __NUTTX_MM_H
#define __NUTTX_MM_H
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
/****************************************************************************
* Definitions
****************************************************************************/
/****************************************************************************
* Global Data
****************************************************************************/
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
/****************************************************************************
* Global Function Prototypes
****************************************************************************/
#ifdef __cplusplus
#define EXTERN extern "C"
extern "C" {
#else
#define EXTERN extern
#endif
/* Functions contained in mm_initialize.c ***********************************/
EXTERN void mm_initialize(FAR void *heap_start, size_t heap_size);
EXTERN void mm_addregion(FAR void *heapstart, size_t heapsize);
/* Functions contained in mm_sem.c ******************************************/
EXTERN int mm_trysemaphore(void);
EXTERN void mm_givesemaphore(void);
#undef EXTERN
#ifdef __cplusplus
}
#endif
#endif /* __NUTTX_MM_H */

2
include/nuttx/net.h
View File

@ -45,7 +45,6 @@
#include <semaphore.h>
#include <nuttx/os_external.h>
#include <net/uip/uip.h>
#include <net/uip/psock.h>
@ -126,6 +125,7 @@ extern "C" {
/* net_sockets.c *************************************************************/
EXTERN void weak_function net_initialize(void);
EXTERN FAR struct socketlist *net_alloclist(void);
EXTERN int net_addreflist(FAR struct socketlist *list);
EXTERN int net_releaselist(FAR struct socketlist *list);

2
lib/lib_init.c
View File

@ -42,7 +42,7 @@
#include <errno.h>
#include <nuttx/kmalloc.h>
#include <nuttx/fs.h>
#include <nuttx/os_external.h>
#include <nuttx/lib.h>
#include "lib_internal.h"
/************************************************************

2
mm/mm_environment.h
View File

@ -54,7 +54,7 @@
# include <debug.h>
# include <errno.h>
# include <assert.h>
# include <nuttx/os_external.h>
# include <nuttx/mm.h>
#else
# include <sys/types.h>
# include <string.h>

1
net/net-dsec2timeval.c
View File

@ -43,6 +43,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
#include <nuttx/clock.h>
#include "net-internal.h"

2
net/net-internal.h
View File

@ -43,6 +43,7 @@
#include <nuttx/config.h>
#ifdef CONFIG_NET
#include <time.h>
#include <nuttx/net.h>
#include "net-internal.h"
@ -115,7 +116,6 @@ extern "C" {
/* net-sockets.c *************************************************************/
EXTERN void weak_function net_initialize(void);
EXTERN int sockfd_allocate(void);
EXTERN void sockfd_release(int sockfd);
EXTERN FAR struct socket *sockfd_socket(int sockfd);

9
net/net-sockets.c
View File

@ -38,13 +38,17 @@
****************************************************************************/
#include <nuttx/config.h>
#include <string.h>
#include <semaphore.h>
#include <assert.h>
#include <sched.h>
#include <errno.h>
#include <net/uip/uip.h>
#include <nuttx/net.h>
#include <nuttx/kmalloc.h>
#include "net-internal.h"
/****************************************************************************
@ -91,6 +95,11 @@ static void _net_semtake(FAR struct socketlist *list)
void net_initialize(void)
{
/* Initialize the uIP layer */
uip_init();
/* Initialize the socket lay -- nothing to do */
}
/* Allocate a list of files for a new task */

2
net/net-timeo.c
View File

@ -41,7 +41,7 @@
#if defined(CONFIG_NET) && defined(CONFIG_NET_SOCKOPTS) && !defined(CONFIG_DISABLE_CLOCK)
#include <sys/types.h>
#include <nuttx/os_external.h>
#include <nuttx/clock.h>
#include "net-internal.h"
/****************************************************************************

1
net/net-timeval2dsec.c
View File

@ -43,6 +43,7 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <errno.h>
#include <nuttx/clock.h>
#include "net-internal.h"

1
net/recvfrom.c
View File

@ -45,6 +45,7 @@
#include <string.h>
#include <errno.h>
#include <arch/irq.h>
#include <nuttx/clock.h>
#include "net-internal.h"

2
sched/clock_internal.h
View File

@ -42,7 +42,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/os_external.h>
#include <nuttx/clock.h>
#include <nuttx/compiler.h>
/********************************************************************************

1
sched/mq_descreate.c
View File

@ -45,7 +45,6 @@
#include <sched.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"

1
sched/mq_getattr.c
View File

@ -47,7 +47,6 @@
#include <debug.h>
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"
#include "mq_internal.h"

1
sched/mq_rcvinternal.c
View File

@ -46,7 +46,6 @@
#include <sched.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "mq_internal.h"

1
sched/os_internal.h
View File

@ -43,7 +43,6 @@
#include <queue.h>
#include <sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/os_external.h>
/************************************************************
* Definitions

15
sched/os_start.c
View File

@ -44,8 +44,10 @@
#include <nuttx/arch.h>
#include <nuttx/compiler.h>
#include <nuttx/fs.h>
#include <nuttx/net.h>
#include <nuttx/lib.h>
#include <nuttx/os_external.h>
#include <nuttx/mm.h>
#include <nuttx/init.h>
#include "os_internal.h"
#include "sig_internal.h"
#include "wd_internal.h"
@ -387,6 +389,17 @@ void os_start(void)
}
#endif
/* Initialize the network system */
#ifdef CONFIG_NET
#if 0
if (net_initialize != NULL)
#endif
{
net_initialize();
}
#endif
/* The processor specific details of running the operating system
* will be handled here. Such things as setting up interrupt
* service routines and starting the clock are some of the things

1
sched/pthread_setschedprio.c
View File

@ -42,7 +42,6 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/****************************************************************************

1
sched/sched_free.c
View File

@ -42,6 +42,7 @@
#include <queue.h>
#include <assert.h>
#include <nuttx/arch.h>
#include <nuttx/mm.h>
#include "os_internal.h"
/************************************************************

1
sched/sched_getprioritymax.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/************************************************************

1
sched/sched_getprioritymin.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/************************************************************

1
sched/sched_getscheduler.c
View File

@ -42,7 +42,6 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/************************************************************

1
sched/sched_rrgetinterval.c
View File

@ -42,7 +42,6 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "clock_internal.h"

1
sched/sched_setparam.c
View File

@ -42,7 +42,6 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/************************************************************

1
sched/sched_setscheduler.c
View File

@ -43,7 +43,6 @@
#include <sched.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "clock_internal.h"

1
sched/sched_yield.c
View File

@ -40,7 +40,6 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
/************************************************************

1
sched/sig_internal.h
View File

@ -44,7 +44,6 @@
#include <queue.h>
#include <sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/os_external.h>
/************************************************************
* Definitions

1
sched/sig_procmask.c
View File

@ -47,7 +47,6 @@
#include <sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"

1
sched/sig_releasependingsignal.c
View File

@ -47,7 +47,6 @@
#include <sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"

1
sched/sig_removependingsignal.c
View File

@ -47,7 +47,6 @@
#include <sched.h>
#include <nuttx/kmalloc.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"

1
sched/task_delete.c
View File

@ -41,7 +41,6 @@
#include <sys/types.h>
#include <sched.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#ifndef CONFIG_DISABLE_SIGNALS
# include "sig_internal.h"

1
sched/task_restart.c
View File

@ -41,7 +41,6 @@
#include <sys/types.h>
#include <sched.h>
#include <nuttx/arch.h>
#include <nuttx/os_external.h>
#include "os_internal.h"
#include "sig_internal.h"