Module Name: src
Committed By: pooka
Date: Mon Jan 14 16:50:54 UTC 2013
Modified Files:
src/sys/rump/librump/rumpdev: rump_dev.c
src/sys/rump/librump/rumpnet: rump_net.c
Log Message:
Remove routines which don't make sense (maybe they're some intermediate
phase of the component framework?)
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/rump/librump/rumpdev/rump_dev.c
cvs rdiff -u -r1.15 -r1.16 src/sys/rump/librump/rumpnet/rump_net.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpdev/rump_dev.c
diff -u src/sys/rump/librump/rumpdev/rump_dev.c:1.21 src/sys/rump/librump/rumpdev/rump_dev.c:1.22
--- src/sys/rump/librump/rumpdev/rump_dev.c:1.21 Mon Jan 14 16:45:47 2013
+++ src/sys/rump/librump/rumpdev/rump_dev.c Mon Jan 14 16:50:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_dev.c,v 1.21 2013/01/14 16:45:47 pooka Exp $ */
+/* $NetBSD: rump_dev.c,v 1.22 2013/01/14 16:50:54 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.21 2013/01/14 16:45:47 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v 1.22 2013/01/14 16:50:54 pooka Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -36,7 +36,6 @@ __KERNEL_RCSID(0, "$NetBSD: rump_dev.c,v
int nocomponent(void);
int nocomponent() {return 0;}
-__weak_alias(rump_device_components,nocomponent);
__weak_alias(buf_syncwait,nocomponent);
const char *rootspec = "rump0a"; /* usually comes from config */
@@ -52,7 +51,6 @@ RUMP_COMPONENT(RUMP__FACTION_DEV)
config_init_mi();
rump_component_init(RUMP_COMPONENT_DEV);
- rump_device_components();
rump_pdev_finalize();
Index: src/sys/rump/librump/rumpnet/rump_net.c
diff -u src/sys/rump/librump/rumpnet/rump_net.c:1.15 src/sys/rump/librump/rumpnet/rump_net.c:1.16
--- src/sys/rump/librump/rumpnet/rump_net.c:1.15 Mon Jan 14 16:48:08 2013
+++ src/sys/rump/librump/rumpnet/rump_net.c Mon Jan 14 16:50:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_net.c,v 1.15 2013/01/14 16:48:08 pooka Exp $ */
+/* $NetBSD: rump_net.c,v 1.16 2013/01/14 16:50:54 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_net.c,v 1.15 2013/01/14 16:48:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_net.c,v 1.16 2013/01/14 16:50:54 pooka Exp $");
#include <sys/param.h>
@@ -41,10 +41,6 @@ __KERNEL_RCSID(0, "$NetBSD: rump_net.c,v
#include "rump_private.h"
#include "rump_net_private.h"
-void nocomponent(void);
-void nocomponent() {}
-__weak_alias(rump_net_components,nocomponent);
-
RUMP_COMPONENT(RUMP__FACTION_NET)
{
@@ -60,5 +56,4 @@ RUMP_COMPONENT(RUMP__FACTION_NET)
rump_component_init(RUMP_COMPONENT_NET_ROUTE);
rump_component_init(RUMP_COMPONENT_NET_IF);
rump_component_init(RUMP_COMPONENT_NET_IFCFG);
- rump_net_components();
}
