get_mon_params -> env_get_params.

diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index 9ac076ae6a845b73dc81c96c2dd892121f8f129b..cc4cb0341f1b4646da2fbb9fc22b1d00c6bb663a 100755 (executable)
--- 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 6251ae8c939bdeca204d8eb93c9a64bb9b9c911e..f85a04b058aaa2c23fadca1979ccb98f0b1009f3 100644 (file)
--- 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 de4b4b1b71ac185d06f75efa5a69696c3c6c0024..97ee83162d42036de9f670f59fdcc224c651e16f 100644 (file)
--- 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;