diff --git a/platform/win32/contiki-main.c b/platform/win32/contiki-main.c
index c3f2caeb8..6aa180798 100644
--- a/platform/win32/contiki-main.c
+++ b/platform/win32/contiki-main.c
@@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt
*
- * $Id: contiki-main.c,v 1.4 2007/04/06 23:09:32 oliverschmidt Exp $
+ * $Id: contiki-main.c,v 1.5 2007/04/09 11:57:15 oliverschmidt Exp $
*/
#define WIN32_LEAN_AND_MEAN
@@ -58,6 +58,7 @@ PROCINIT(&etimer_process,
&cfs_win32_process,
&ctk_conio_service_process,
&ctk_process,
+ &wpcap_service_process,
&tcpip_process,
&resolv_process,
&program_handler_process);
@@ -130,8 +131,6 @@ main(void)
uip_ipaddr(&addr, 192,168,0,1);
resolv_conf(&addr);
-
- program_handler_load("wpcap.drv", NULL);
}
#endif
diff --git a/platform/win32/contiki.sln b/platform/win32/contiki.sln
index 9c4d07e11..1e7cfb7d7 100644
--- a/platform/win32/contiki.sln
+++ b/platform/win32/contiki.sln
@@ -87,13 +87,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.prg", "vcproj\web
{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
EndProjectSection
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.drv", "vcproj\wpcap.drv.vcproj", "{39F3E492-1EE3-4904-8962-D482011AB375}"
- ProjectSection(ProjectDependencies) = postProject
- {DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.dsc", "vcproj\wpcap.dsc.vcproj", "{618101EC-0777-4FA6-B1B7-3B7C1981707B}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.dsc", "vcproj\www.dsc.vcproj", "{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.prg", "vcproj\www.prg.vcproj", "{2A1D67D7-7FAE-42D3-AC99-DB68A3570735}"
@@ -207,14 +200,6 @@ Global
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Debug|Win32.Build.0 = Debug|Win32
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Release|Win32.ActiveCfg = Release|Win32
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Release|Win32.Build.0 = Release|Win32
- {39F3E492-1EE3-4904-8962-D482011AB375}.Debug|Win32.ActiveCfg = Debug|Win32
- {39F3E492-1EE3-4904-8962-D482011AB375}.Debug|Win32.Build.0 = Debug|Win32
- {39F3E492-1EE3-4904-8962-D482011AB375}.Release|Win32.ActiveCfg = Release|Win32
- {39F3E492-1EE3-4904-8962-D482011AB375}.Release|Win32.Build.0 = Release|Win32
- {618101EC-0777-4FA6-B1B7-3B7C1981707B}.Debug|Win32.ActiveCfg = Debug|Win32
- {618101EC-0777-4FA6-B1B7-3B7C1981707B}.Debug|Win32.Build.0 = Debug|Win32
- {618101EC-0777-4FA6-B1B7-3B7C1981707B}.Release|Win32.ActiveCfg = Release|Win32
- {618101EC-0777-4FA6-B1B7-3B7C1981707B}.Release|Win32.Build.0 = Release|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Debug|Win32.ActiveCfg = Debug|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Debug|Win32.Build.0 = Debug|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Release|Win32.ActiveCfg = Release|Win32
diff --git a/platform/win32/net/wpcap-dsc.c b/platform/win32/net/wpcap-dsc.c
deleted file mode 100644
index c83a76f4e..000000000
--- a/platform/win32/net/wpcap-dsc.c
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006, Swedish Institute of Computer Science.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Institute nor the names of its contributors
- * may be used to endorse or promote products derived from this software
- * without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- * This file is part of the Contiki operating system.
- *
- * Author: Oliver Schmidt
- *
- * $Id: wpcap-dsc.c,v 1.1 2006/09/23 20:25:02 oliverschmidt Exp $
- */
-
-#include "sys/dsc.h"
-
-extern struct ctk_icon wpcap_icon;
-/*-----------------------------------------------------------------------------------*/
-DSC(wpcap_dsc,
- "WinPcap driver",
- "wpcap.drv",
- wpcap_process,
- &wpcap_icon);
-/*-----------------------------------------------------------------------------------*/
-#if CTK_CONF_ICON_BITMAPS
-static unsigned char wpcapicon_bitmap[3*3*8] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
-};
-#endif /* CTK_CONF_ICON_BITMAPS */
-
-#if CTK_CONF_ICON_TEXTMAPS
-static char wpcapicon_textmap[9] = {
- 'W', 'i', 'n',
- ' ', 'P', ' ',
- 'c', 'a', 'p'
-};
-#endif /* CTK_CONF_ICON_TEXTMAPS */
-
-#if CTK_CONF_ICONS
-static struct ctk_icon wpcap_icon =
- {CTK_ICON("WinPcap driver", wpcapicon_bitmap, wpcapicon_textmap)};
-#endif /* CTK_CONF_ICONS */
-/*-----------------------------------------------------------------------------------*/
diff --git a/platform/win32/vcproj/contiki.exe.vcproj b/platform/win32/vcproj/contiki.exe.vcproj
index c68a9d7e0..27cae3a6e 100644
--- a/platform/win32/vcproj/contiki.exe.vcproj
+++ b/platform/win32/vcproj/contiki.exe.vcproj
@@ -358,6 +358,10 @@
RelativePath="..\..\..\core\net\uip.h"
>
+
+
@@ -503,6 +507,18 @@
>
+
+
+
+
+
+
diff --git a/platform/win32/vcproj/wpcap.drv.vcproj b/platform/win32/vcproj/wpcap.drv.vcproj
deleted file mode 100644
index b80b04e39..000000000
--- a/platform/win32/vcproj/wpcap.drv.vcproj
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/platform/win32/vcproj/wpcap.dsc.vcproj b/platform/win32/vcproj/wpcap.dsc.vcproj
deleted file mode 100644
index 842fa0c2b..000000000
--- a/platform/win32/vcproj/wpcap.dsc.vcproj
+++ /dev/null
@@ -1,180 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-