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

Fix a couple of recently introduced build problems

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3463 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-04-04 21:02:15 +00:00
parent 797df706c1
commit cf3d515a6b
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/Makefile
View File

@ -115,7 +115,7 @@ endif
endif
CSRCS += $(SERIAL_CSRCS) $(NET_CSRCS) $(PIPE_CSRCS) $(USBDEV_CSRCS) \
$(USBHOST_CSRCS) $(MMCSD_CSRCS) $(LCD_CSRCS) $(BCH_CSRCS) \
$(MTD_CSRCS)
$(MTD_CSRCS) $(I2C_CSRCS)
COBJS = $(CSRCS:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS)
@ -123,7 +123,7 @@ OBJS = $(AOBJS) $(COBJS)
BIN = libdrivers$(LIBEXT)
VPATH = serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd
VPATH = serial:net:pipes:usbdev:usbhost:mmcsd:lcd:bch:mtd:i2c
all: $(BIN)
@ -141,7 +141,7 @@ $(BIN): $(OBJS)
.depend: Makefile $(SRCS)
@$(MKDEP) $(ROOTDEPPATH) $(SERIALDEPPATH) $(NETDEPPATH) $(PIPEDEPPATH) \
$(USBDEVDEPPATH) $(USBHOSTDEPPATH) $(MMCSDDEPPATH) $(LCDDEPPATH) \
$(BCHDEPPATH) $(MTDDEPPATH) \
$(BCHDEPPATH) $(MTDDEPPATH) $(I2CDEPPATH)\
$(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep
@touch $@

5
include/nuttx/pthread.h
View File

@ -43,6 +43,7 @@
#include <nuttx/config.h>
#include <pthread.h>
#include <sched.h>
/****************************************************************************
* Pre-Processor Definitions
@ -62,7 +63,9 @@
* Public Data
****************************************************************************/
/* Default pthread attributes (see sched/pthread_create.c) */
/* Default pthread attributes (see sched/pthread_create.c). This global
* can only be shared within the kernel- or within the user- address space.
*/
extern pthread_attr_t g_default_pthread_attr;

10
lib/pthread/pthread_attrinit.c
View File

@ -58,6 +58,16 @@
* Global Variables
****************************************************************************/
/* Default pthread attributes (see included/nuttx/pthread.h). When configured
* to build separate kernel- and user-address spaces, this global is
* duplicated in each address spaced. This copy can only be shared within
* the user address space.
*/
#if defined(CONFIG_NUTTX_KERNEL) && !defined(__KERNEL__)
pthread_attr_t g_default_pthread_attr = PTHREAD_ATTR_INITIALIZER;
#endif
/****************************************************************************
* Private Variables
****************************************************************************/