From 9df46b3507696df96d2c024355b7def63c357560 Mon Sep 17 00:00:00 2001
From: Oliver Hahm <oleg@hobbykeller.org>
Date: Fri, 15 Feb 2013 22:17:42 +0100
Subject: [PATCH] * fixed makefiles for msb-430h support
---
core/oneway_malloc.c | 1 -
drivers/cc110x_ng/makefile | 3 +++
drivers/makefile | 2 ++
drivers/sht11/makefile | 2 +-
makefile | 2 +-
makefile.base | 5 +++++
makefile.dep | 6 ++++++
sys/lib/hashtable.c | 8 ++++----
sys/lib/hashtable.h | 2 +-
9 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/core/oneway_malloc.c b/core/oneway_malloc.c
index d43bb610ae..34969fe602 100644
--- a/core/oneway_malloc.c
+++ b/core/oneway_malloc.c
@@ -16,7 +16,6 @@
*/
#include <stdio.h>
-#include <sys/unistd.h>
#include <string.h>
#include <stdlib.h>
diff --git a/drivers/cc110x_ng/makefile b/drivers/cc110x_ng/makefile
index c6490934a2..1a28fd0870 100644
--- a/drivers/cc110x_ng/makefile
+++ b/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
diff --git a/drivers/makefile b/drivers/makefile
index e28b633166..763f2544be 100644
--- a/drivers/makefile
+++ b/drivers/makefile
@@ -1,3 +1,5 @@
+MODULE = drivers
+
DIRS=
ifneq (,$(findstring powermon,$(USEMODULE)))
DIRS += powermon
diff --git a/drivers/sht11/makefile b/drivers/sht11/makefile
index bfc0a2b08e..cd43db5ef3 100644
--- a/drivers/sht11/makefile
+++ b/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
diff --git a/makefile b/makefile
index 372db1e696..ca2faf9091 100644
--- a/makefile
+++ b/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:
diff --git a/makefile.base b/makefile.base
index 65474687c9..8e781605f1 100644
--- a/makefile.base
+++ b/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)
diff --git a/makefile.dep b/makefile.dep
index 4582bee5d2..2a04fe76fd 100644
--- a/makefile.dep
+++ b/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
diff --git a/sys/lib/hashtable.c b/sys/lib/hashtable.c
index 763357edce..ef64057cb1 100755
--- a/sys/lib/hashtable.c
+++ b/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*))
{
diff --git a/sys/lib/hashtable.h b/sys/lib/hashtable.h
index b90781abd4..e53aea267b 100755
--- a/sys/lib/hashtable.h
+++ b/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*));
--
GitLab