update version and ssdp

git-svn-id: http://svn.osdn.jp/svnroot/mimic/trunk@303 47198e57-cb75-475f-84c4-a814cd6f29e0

diff --git a/lib/Debug/makefile b/lib/Debug/makefile
deleted file mode 100644 (file)
index 4026984..0000000
--- a/lib/Debug/makefile
+++ /dev/null
@@ -1,67 +0,0 @@
-################################################################################\r
-# Automatically-generated file. Do not edit!\r
-################################################################################\r
-\r
--include ../makefile.init\r
-\r
-RM := rm -rf\r
-\r
-# All of the sources participating in the build are defined here\r
--include sources.mk\r
--include subdir.mk\r
--include src/utils/subdir.mk\r
--include src/uip/subdir.mk\r
--include src/os/freertos/subdir.mk\r
--include src/net/upnp/subdir.mk\r
--include src/net/mdns/subdir.mk\r
--include src/net/httpd/mod/subdir.mk\r
--include src/net/httpd/subdir.mk\r
--include src/net/dhcp/subdir.mk\r
--include src/net/apipa/subdir.mk\r
--include src/net/subdir.mk\r
--include src/mimicvm/subdir.mk\r
--include src/include/boot/subdir.mk\r
--include src/http/subdir.mk\r
--include src/flash/subdir.mk\r
--include src/driver/uip/subdir.mk\r
--include src/driver/irq/subdir.mk\r
--include src/driver/flash/subdir.mk\r
--include src/subdir.mk\r
--include objects.mk\r
-\r
-ifneq ($(MAKECMDGOALS),clean)\r
-ifneq ($(strip $(C_DEPS)),)\r
--include $(C_DEPS)\r
-endif\r
-endif\r
-\r
--include ../makefile.defs\r
-\r
-# Add inputs and outputs from these tool invocations to the build variables \r
-\r
-# All Target\r
-all: libNyLPCLib.a\r
-\r
-# Tool invocations\r
-libNyLPCLib.a: $(OBJS) $(USER_OBJS)\r
-       @echo 'Building target: $@'\r
-       @echo 'Invoking: MCU Archiver'\r
-       arm-none-eabi-ar -r "libNyLPCLib.a" $(OBJS) $(USER_OBJS) $(LIBS)\r
-       @echo 'Finished building target: $@'\r
-       @echo ' '\r
-       $(MAKE) --no-print-directory post-build\r
-\r
-# Other Targets\r
-clean:\r
-       -$(RM) $(OBJS)$(C_DEPS)$(ARCHIVES) libNyLPCLib.a\r
-       -@echo ' '\r
-\r
-post-build:\r
-       -@echo 'Performing post-build steps'\r
-       -arm-none-eabi-size libNyLPCLib.a ; # arm-none-eabi-objdump -h -S libNyLPCLib.a >libNyLPCLib.lss\r
-       -@echo ' '\r
-\r
-.PHONY: all clean dependents\r
-.SECONDARY: post-build\r
-\r
--include ../makefile.targets\r

diff --git a/lib/Debug/sources.mk b/lib/Debug/sources.mk
deleted file mode 100644 (file)
index d412685..0000000
--- a/lib/Debug/sources.mk
+++ /dev/null
@@ -1,35 +0,0 @@
-################################################################################\r
-# Automatically-generated file. Do not edit!\r
-################################################################################\r
-\r
-O_SRCS := \r
-C_SRCS := \r
-S_SRCS := \r
-S_UPPER_SRCS := \r
-OBJ_SRCS := \r
-ASM_SRCS := \r
-OBJS := \r
-C_DEPS := \r
-ARCHIVES := \r
-\r
-# Every subdirectory with source files must be described here\r
-SUBDIRS := \
-src/utils \
-src/uip \
-src/os/freertos \
-src/net/upnp \
-src/net/mdns \
-src/net/httpd/mod \
-src/net/httpd \
-src/net/dhcp \
-src/net/apipa \
-src/net \
-src/mimicvm \
-src/include/boot \
-src/http \
-src/flash \
-src/driver/uip \
-src/driver/irq \
-src/driver/flash \
-src \
-\r

diff --git a/lib/src/NyLPC_cMiMicEnv.h b/lib/src/NyLPC_cMiMicEnv.h
index f8f60d7..80b2ea0 100644 (file)
--- a/lib/src/NyLPC_cMiMicEnv.h
+++ b/lib/src/NyLPC_cMiMicEnv.h
@@ -13,7 +13,7 @@ extern "C" {
 #endif /* __cplusplus */\r
 \r
 \r
-#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.50"\r
+#define NyLPC_cMiMicEnv_VERSION "MiMic/1.4.51"\r
 \r
 \r
 #ifdef __cplusplus\r

diff --git a/lib/src/net/upnp/NyLPC_cSsdpSocket.c b/lib/src/net/upnp/NyLPC_cSsdpSocket.c
index 4dfd8b7..e019eff 100644 (file)
--- a/lib/src/net/upnp/NyLPC_cSsdpSocket.c
+++ b/lib/src/net/upnp/NyLPC_cSsdpSocket.c
@@ -593,9 +593,10 @@ void NyLPC_cSsdpSocket_start(NyLPC_TcSsdpSocket_t* i_inst)
 {\r
        //Notifyを3回送信\r
        NyLPC_TInt16 i;\r
-       for(i=0;i<3;i++){\r
+       NyLPC_cSsdpSocket_notify(i_inst);\r
+       for(i=0;i<2;i++){\r
+               NyLPC_cThread_sleep(800);\r
                NyLPC_cSsdpSocket_notify(i_inst);\r
-               NyLPC_cThread_sleep(1000);\r
        }\r
 \r
        //ストップウォッチの開始要求\r