summaryrefslogtreecommitdiff
path: root/cleopatre/devkit/p1905_managerd
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre/devkit/p1905_managerd')
-rw-r--r--cleopatre/devkit/p1905_managerd/Makefile70
-rwxr-xr-x[-rw-r--r--]cleopatre/devkit/p1905_managerd/S98p19050
-rw-r--r--cleopatre/devkit/p1905_managerd/src/p1905_utils.c46
3 files changed, 36 insertions, 80 deletions
diff --git a/cleopatre/devkit/p1905_managerd/Makefile b/cleopatre/devkit/p1905_managerd/Makefile
index 878a12fcda..0298408530 100644
--- a/cleopatre/devkit/p1905_managerd/Makefile
+++ b/cleopatre/devkit/p1905_managerd/Makefile
@@ -3,30 +3,37 @@ BIN=p1905_managerd
OBJPATH=obj
SRCPATH=src
INCPATH=inc
-OBJINCPATH=$(OBJPATH)/inc
-#ifeq ($(AP_AUTO_CONFIG_SUPPORT),y)
-#ifeq ($(AP_REGISTRAR),y)
-#BIN=p1905_managerd_ap_router
-#else
-#BIN=p1905_managerd_ap_extender
-#endif
-#endif
+CLEO_BASE=../..
+LIBMME_DIR=$(CLEO_BASE)/application/libmme
+LIBSPID_DIR=$(CLEO_BASE)/application/libspid
+LIBALME_DIR=$(CLEO_BASE)/application/libalme
+LINUX_DIR=$(CLEO_BASE)/linux-2.6.25.10-spc300
+
+LIBSPID_SO_BIN = $(LIBSPID_DIR)/libspid.so
+LIBMME_SO_BIN = $(LIBMME_DIR)/libmme.so
+LIBALME_SO_BIN = $(LIBALME_DIR)/libalme.so
+
+ifeq ($(VERSION), )
+VERSION=$(shell git describe --always 2>/dev/null)
+endif
+
+RESPONSE_FILE=extra_flags
+INCLUDES = -I$(INCPATH) \
+ -I$(CLEO_BASE)/include \
+ -I$(LINUX_DIR)/include \
+ -I$(LINUX_DIR)/include/asm-arm/arch-spc300 \
+ $(shell $(LIBSPID_DIR)/libspid-config --I_opts) \
+ $(shell $(LIBALME_DIR)/libalme-config --I_opts)
-ifeq ($(CC_FOR_TARGET),) #direct compile
CC=arm-linux-gcc
-CC_WITH_CFLAGS=$(CC) -I/opt/spidcom/spc300/usr/include -g -Os
-CC_WITHOUT_CFLAGS=$(CC)
-LINUX_DIR=../../linux-2.6.25.10-spc300
-LIBSPID_DIR=../../application/libspid
-LIBMME_DIR=../../application/libmme
-LIBALME_DIR=../../application/libalme
-else #compile from buildroot
-CC_WITH_CFLAGS=$(CC)
-CC_WITHOUT_CFLAGS=$(CC_FOR_TARGET)
-endif
-CLEO_INC=../../include
-EXTRA_CFLAGS=-I$(INCPATH) -I$(OBJINCPATH) -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm-arm/arch-spc300 -I$(LIBMME_DIR)/inc -I$(LIBSPID_DIR)/inc -I$(LIBALME_DIR)/inc -I$(CLEO_INC) -MMD
+CFLAGS += $(INCLUDES) -Os -MMD -Wall -DVERSION=\"$(VERSION)\"
+
+LIBFLAGS = $(shell $(LIBSPID_DIR)/libspid-config --L_opts) \
+ $(shell $(LIBSPID_DIR)/libspid-config --libs) \
+ $(shell $(LIBALME_DIR)/libalme-config --L_opts) \
+ $(shell $(LIBALME_DIR)/libalme-config --libs) \
+ -lrt
#################################################################################
#support interface
@@ -71,8 +78,6 @@ EXTRA_CFLAGS+= -DMT7601_ENABLE
endif
endif
-LIBS=-L$(LIBMME_DIR) -L$(LIBSPID_DIR) -lmme -lspid -lpthread
-
#################################################################################
#below is for source code include
#################################################################################
@@ -104,29 +109,27 @@ ifeq ($(PLC_SUPPORT),y)
SRCS+=plc_utils.c
endif
+#################################################################################
+#below is for build
+#################################################################################
OBJS=$(addprefix $(OBJPATH)/,$(SRCS:.c=.o))
DEPS=$(patsubst %o,%d,$(OBJS))
all: $(BIN)
-$(BIN): libspid libmme $(OBJS)
- $(CC_WITHOUT_CFLAGS) -o $@ $(OBJS) $(LIBS)
+$(BIN): $(OBJS) $(LIBSPID_SO_BIN) $(LIBMME_SO_BIN) $(LIBALME_SO_BIN)
+ $(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBFLAGS)
$(OBJPATH)/%.o: $(SRCPATH)/%.c
- $(CC_WITH_CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
+ $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
$(OBJS): | $(OBJPATH)
$(OBJPATH):
mkdir $(OBJPATH)
-$(OBJINCPATH): | $(OBJPATH)
- mkdir $@
-libspid:
- $(MAKE) -C $(LIBSPID_DIR) libspid.so
-
-libmme:
- $(MAKE) -C $(LIBMME_DIR) libmme.so
+$(LIBSPID_SO_BIN) $(LIBMME_SO_BIN) $(LIBALME_SO_BIN):
+ $(error libspid or libmme or libalme output files are not found)
-include $(DEPS)
@@ -134,5 +137,4 @@ libmme:
clean:
rm -f $(OBJS) $(DEPS) $(BIN)
- rm -rf $(OBJINCPATH)
rmdir $(OBJPATH)
diff --git a/cleopatre/devkit/p1905_managerd/S98p1905 b/cleopatre/devkit/p1905_managerd/S98p1905
index a6d3e86ccc..a6d3e86ccc 100644..100755
--- a/cleopatre/devkit/p1905_managerd/S98p1905
+++ b/cleopatre/devkit/p1905_managerd/S98p1905
diff --git a/cleopatre/devkit/p1905_managerd/src/p1905_utils.c b/cleopatre/devkit/p1905_managerd/src/p1905_utils.c
index 0da5cdac0d..8af9049f38 100644
--- a/cleopatre/devkit/p1905_managerd/src/p1905_utils.c
+++ b/cleopatre/devkit/p1905_managerd/src/p1905_utils.c
@@ -540,52 +540,6 @@ unsigned short get_bridge_port_no(char *itf_name)
return port_no;
}
-static void* mme_thread(void *arg)
-{
- mme_error_t ret = MME_SUCCESS;
- mme_ctx_t s_rcv_ctx, s_snd_ctx;
- mme_ctx_t *rcv_ctx = &s_rcv_ctx;
- mme_ctx_t *snd_ctx = &s_snd_ctx;
- thread_ctx *td_ctx;
-
- unsigned char snd_buff[2048] = {0};
- unsigned char rcv_buff[2048] = {0};
- unsigned char dst_addr[6] = {0};
-
- td_ctx = (thread_ctx *)arg;
- memcpy(dst_addr,td_ctx->local_itf, ETH_ALEN);
-
- /* form the send message context */
- snd_ctx->buffer = snd_buff;
- snd_ctx->mmtype = td_ctx->mmtype;
- snd_ctx->length = sizeof(snd_buff);
- snd_ctx->head = 256;
- snd_ctx->tail = 256;
- snd_ctx->status = MME_STATUS_OK;
-
- /* form the receive message context */
- rcv_ctx->buffer = rcv_buff;
- rcv_ctx->mmtype = td_ctx->mmtype + 1;
- rcv_ctx->length = sizeof(rcv_buff);
- rcv_ctx->head = 256;
- rcv_ctx->tail = 256;
- rcv_ctx->status = MME_STATUS_OK;
-
- ret = mme_send (snd_ctx, MME_SEND_REQ_CNF, NULL, dst_addr, rcv_ctx);
-
- if(ret == MME_SUCCESS)
- {
- has_confirm = 1;
- memcpy(td_ctx->recv_buf, (rcv_ctx->buffer + rcv_ctx->head),
- (rcv_ctx->tail - rcv_ctx->head));
- }
- else
- {
- debug_syslog("mme fail, ret=%d\n",ret);
- has_confirm = 0;
- }
-}
-
int get_link_phy_rate(itftype media_type, unsigned char *target,
unsigned char *local_itf, unsigned short *phyrate)
{