From: Philip Homburg <philip@cs.vu.nl>
Date: Fri, 5 Aug 2005 16:21:32 +0000 (+0000)
Subject: get_mon_params -> env_get_params.
X-Git-Tag: v3.1.0~421
X-Git-Url: http://zhaoyanbai.com/repos/doc/html/static/gitweb.css?a=commitdiff_plain;h=655d1e074f9b658725c804b96df07da97ab57fb7;p=minix.git

get_mon_params -> env_get_params.
---

diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index 9ac076ae6..cc4cb0341 100755
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -175,7 +175,6 @@ re_t;
 
 static re_t re_table[RE_PORT_NR];
 
-static int rl_tasknr;
 static u16_t eth_ign_proto;
 static tmra_ut rl_watchdog;
 
@@ -273,17 +272,16 @@ PRIVATE int int_event_check;		/* set to TRUE if events arrived */
 extern int errno;
 
 /*===========================================================================*
- *				rtl8139_task				     *
+ *				main				     *
  *===========================================================================*/
-void main(void)
+int main(int argc, char *argv[])
 {
 	int fkeys, sfkeys;
 	int i, r;
 	re_t *rep;
 	long v;
 
-	if ((rl_tasknr = getprocnr()) < 0)
-		panic("RTL8139", "getprocnr failed", errno);
+	env_setargs(argc, argv);
 
 	v= 0;
 	(void) env_parse("ETH_IGN_PROTO", "x", 0, &v, 0x0000L, 0xFFFFL);
@@ -528,7 +526,7 @@ static void rl_pci_conf()
 		rep->re_name[8] += i;
 		rep->re_seen= FALSE;
 		envvar[sizeof(RL_ENVVAR)-1]= '0'+i;
-		if (0 == get_mon_param(envvar, val, sizeof(val)) && 
+		if (0 == env_get_param(envvar, val, sizeof(val)) && 
 				! env_prefix(envvar, "pci")) {
 			env_panic(envvar);
 		}
diff --git a/servers/fs/dmap.c b/servers/fs/dmap.c
index 6251ae8c9..f85a04b05 100644
--- a/servers/fs/dmap.c
+++ b/servers/fs/dmap.c
@@ -131,9 +131,9 @@ PUBLIC void map_controller()
   int i,s;
 
   /* Get settings of 'controller' and 'driver' at the boot monitor. */
-  if ((s = get_mon_param("label", driver, sizeof(driver))) != OK) 
+  if ((s = env_get_param("label", driver, sizeof(driver))) != OK) 
       panic(__FILE__,"couldn't get boot monitor parameter 'driver'", s);
-  if ((s = get_mon_param("controller", controller, sizeof(controller))) != OK) 
+  if ((s = env_get_param("controller", controller, sizeof(controller))) != OK) 
       panic(__FILE__,"couldn't get boot monitor parameter 'controller'", s);
 
   /* Determine major number to map driver onto. */
diff --git a/servers/fs/main.c b/servers/fs/main.c
index de4b4b1b7..97ee83162 100644
--- a/servers/fs/main.c
+++ b/servers/fs/main.c
@@ -254,7 +254,7 @@ int optional;
   char value[64];
   int i;
 
-  if ((i = get_mon_param(key, value, sizeof(value))) != OK) {
+  if ((i = env_get_param(key, value, sizeof(value))) != OK) {
       if(!optional)
       	printf("FS: Warning, couldn't get monitor param: %d\n", i);
       return 0;