Added missing spin-lock initialization and minor Makefiles update.

diff --git a/lincan/Makefile b/lincan/Makefile
index 87f2000ad8468a0b0ff1449c34f2294ba7b53e98..d64354563d43ba4a44109f118b605d533e4119b0 100644 (file)
--- a/lincan/Makefile
+++ b/lincan/Makefile
@@ -9,37 +9,33 @@
 #
 ########## The following options can be changed ##########
 
+SUBDIRS = src utils
 
-ifneq ($(wildcard ./Standalone.mk),)
-# Standalone make outside of OCERA framework
+ifndef SOURCES_DIR
+SOURCES_DIR := $(shell ( pwd -L ) )
+endif
 
-SUBDIRS = src utils
+ifneq ($(wildcard $(SOURCES_DIR)/Standalone.mk),)
+# Standalone make outside of OCERA framework
 
 all: default
 
 .PHONY: dep default subdirs clean cleandepend
+.PHONY: check-dir include-pass library-pass binary-pass utils-pass kernel-lib-pass kernel-pass
 
 dirs = src utils
 
-default dep clean install:
-       $(foreach dir, $(dirs), $(MAKE) -C $(dir) $@ ; )
+default dep clean install utils-pass kernel-pass:
+       $(foreach dir, $(dirs), $(MAKE) -C $(SOURCES_DIR)/$(dir) \
+           SOURCES_DIR=$(SOURCES_DIR)/$(dir) $@ ; )
 
 else
 # Build in structure of OCERA framework
 
 TOPDIR = $(LINUX_DIR)
-COMPONENT = CONFIG_OC_LINCAN
-COMPONENT_NAME = lincan
-COMPONENT_TARGETS = default
 
 ifneq ($(wildcard ../../../../ocera.mk),)
 include ../../../../ocera.mk
-
-dirs = src utils
-
-default dep clean install:
-       $(foreach dir, $(dirs), $(MAKE) -C $(dir) $@ ; )
-
 else
 all: 
        @echo -e "\nTo build LinCAN driver for OCERA framework, ocera.mk file have"

diff --git a/lincan/src/Makefile b/lincan/src/Makefile
index ae8bd4d4e0478e5afcc7832af771baa0f153f4cf..1a0f0e9509a561dec6559d27b155814e39669677 100644 (file)
--- a/lincan/src/Makefile
+++ b/lincan/src/Makefile
@@ -17,6 +17,10 @@ ifneq ($(wildcard ../Standalone.mk),)
 
 all : default
 
+.PHONY: kernel-pass utils-pass
+
+kernel-pass : default
+
 else
 # Build in structure of OCERA framework
 

diff --git a/lincan/src/can_quekern.c b/lincan/src/can_quekern.c
index fa7e33c00374a018f42e3621341b7069c207694d..8725f645cd94deefbc7308d2a70eccafc08677aa 100644 (file)
--- a/lincan/src/can_quekern.c
+++ b/lincan/src/can_quekern.c
@@ -414,6 +414,5 @@ int canqueue_ends_dispose_kern(struct canque_ends_t *qends, int sync)
 
 void canqueue_kern_initialize()
 {
-
-
+       can_spin_lock_init(&canque_dead_func_lock);
 }

diff --git a/lincan/utils/Makefile b/lincan/utils/Makefile
index a05c3428eb12c4eebb65f3914e8311d5fe88d491..1912466555478ad781fab40829c46d0c69cfd21a 100644 (file)
--- a/lincan/utils/Makefile
+++ b/lincan/utils/Makefile
@@ -17,8 +17,13 @@ CFLAGS = -I../include -O2 -Wall
 
 all: default
 
+.PHONY: dep default subdirs clean cleandepend
+.PHONY: check-dir include-pass library-pass binary-pass utils-pass kernel-pass
+
 default: utils
 
+utils-pass: utils
+
 dep:
        $(CC) $(CFLAGS) $(CPPFLAGS) -w -E -M *.c $(MORE_C_FILES) > .depend