* fixed makefiles for msb-430h support

core/oneway_malloc.c

@@ -16,7 +16,6 @@
  */
 
 #include <stdio.h>
-#include <sys/unistd.h>
 #include <string.h>
 #include <stdlib.h>
 

drivers/cc110x_ng/makefile

@@ -2,6 +2,9 @@ INCLUDES = -I$(RIOTBASE)/sys/include -I../../net -I../include -I../../lib -I../.
 MODULE =cc110x_ng
 
 DIRS =
+ifneq (,$(findstring msb-430h,$(BOARD)))
+	DIRS += spi 
+endif
 ifneq (,$(findstring msba2,$(BOARD)))
 	DIRS += spi 
 endif

drivers/makefile

@@ -1,3 +1,5 @@
+MODULE = drivers
+
 DIRS=
 ifneq (,$(findstring powermon,$(USEMODULE)))
     DIRS += powermon

drivers/sht11/makefile

@@ -1,4 +1,4 @@
-INCLUDES = -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
+INCLUDES += -I$(RIOTBASE)/core/include -I../include -I$(RIOTBOARD)/$(BOARD)
 MODULE =sht11
 include $(MAKEBASE)/makefile.base
 

makefile

@@ -7,7 +7,7 @@ all:
 clean:
 	@for i in $(DIRS) ; do $(MAKE) -C $$i clean ; done ;
 	@if [ -d $(BINDIR) ] ; \
-	then rmdir $(BINDIR) ; \
+	then rmdir --ignore-fail-on-non-empty $(BINDIR) ; \
 	fi 
 
 doc:

makefile.base

@@ -25,6 +25,11 @@ ifeq ($(BOARD),msba2)
  INCLUDES += -I$(RIOTBOARD)/msba2-common/include/
  INCLUDES += -I$(RIOTBOARD)/msba2-common/drivers/include/
 endif
+ifeq ($(BOARD),msb-430h)
+ INCLUDES += -I$(RIOTBOARD)/msb-430h/include/
+ INCLUDES += -I$(RIOTBOARD)/msb-430-common/include/
+ INCLUDES += -I$(RIOTBOARD)/msb-430-common/drivers/include/
+endif
 
 $(BINDIR)$(MODULE).a: $(OBJ) $(ASMOBJ)
 	$(AR) -rc $(BINDIR)$(MODULE).a $(OBJ) $(ASMOBJ)

makefile.dep

@@ -23,5 +23,11 @@ ifneq (,$(findstring cc110x_ng,$(USEMODULE)))
 		USEMODULE += hwtimer
 	endif
   endif
+  ifneq (,$(findstring msb-430h,$(BOARD)))
+  	USEMODULE += cc110x_spi
+	ifeq (,$(findstring hwtimer,$(USEMODULE)))
+		USEMODULE += hwtimer
+	endif
+  endif
 endif
 

sys/lib/hashtable.c

@@ -1,18 +1,18 @@
 /* Copyright (C) 2004 Christopher Clark <firstname.lastname@cl.cam.ac.uk> */
 
-#include "hashtable.h"
-#include "hashtable_private.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include "hashtable.h"
+#include "hashtable_private.h"
 
 /*
 Credit for primes table: Aaron Krowne
  http://br.endernet.org/~akrowne/
  http://planetmath.org/encyclopedia/GoodHashTablePrimes.html
 */
-static const unsigned int primes[] = {
+static const uint32_t primes[] = {
 53, 97, 193, 389,
 769, 1543, 3079, 6151,
 12289, 24593, 49157, 98317,
@@ -26,7 +26,7 @@ const float max_load_factor = 0.65;
 
 /*****************************************************************************/
 struct hashtable *
-create_hashtable(unsigned int minsize,
+create_hashtable(uint32_t minsize,
                  unsigned int (*hashf) (void*),
                  int (*eqf) (void*,void*))
 {

sys/lib/hashtable.h

@@ -72,7 +72,7 @@ struct hashtable;
  */
 
 struct hashtable *
-create_hashtable(unsigned int minsize,
+create_hashtable(uint32_t minsize,
                  unsigned int (*hashfunction) (void*),
                  int (*key_eq_fn) (void*,void*));