sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

get_mon_params -> env_get_params.

Browse source
This commit is contained in:
Philip Homburg 2005-08-05 16:21:32 +00:00
parent 279cb92ec3
commit 655d1e074f
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/rtl8139/rtl8139.c
View file

@ -175,7 +175,6 @@ re_t;
static re_t re_table[RE_PORT_NR]; static re_t re_table[RE_PORT_NR];
static int rl_tasknr;
static u16_t eth_ign_proto; static u16_t eth_ign_proto;
static tmra_ut rl_watchdog; static tmra_ut rl_watchdog;
@ -273,17 +272,16 @@ PRIVATE int int_event_check; /* set to TRUE if events arrived */
extern int errno; extern int errno;
/*===========================================================================* /*===========================================================================*
* rtl8139_task * * main *
*===========================================================================*/ *===========================================================================*/
void main(void) int main(int argc, char *argv[])
{ {
int fkeys, sfkeys; int fkeys, sfkeys;
int i, r; int i, r;
re_t *rep; re_t *rep;
long v; long v;
if ((rl_tasknr = getprocnr()) < 0) env_setargs(argc, argv);
panic("RTL8139", "getprocnr failed", errno);
v= 0; v= 0;
(void) env_parse("ETH_IGN_PROTO", "x", 0, &v, 0x0000L, 0xFFFFL); (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_name[8] += i;
rep->re_seen= FALSE; rep->re_seen= FALSE;
envvar[sizeof(RL_ENVVAR)-1]= '0'+i; 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_prefix(envvar, "pci")) {
env_panic(envvar); env_panic(envvar);
} }

4
servers/fs/dmap.c
View file

@ -131,9 +131,9 @@ PUBLIC void map_controller()
int i,s; int i,s;
/* Get settings of 'controller' and 'driver' at the boot monitor. */ /* 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); 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); panic(__FILE__,"couldn't get boot monitor parameter 'controller'", s);
/* Determine major number to map driver onto. */ /* Determine major number to map driver onto. */

2
servers/fs/main.c
View file

@ -254,7 +254,7 @@ int optional;
char value[64]; char value[64];
int i; int i;
if ((i = get_mon_param(key, value, sizeof(value))) != OK) { if ((i = env_get_param(key, value, sizeof(value))) != OK) {
if(!optional) if(!optional)
printf("FS: Warning, couldn't get monitor param: %d\n", i); printf("FS: Warning, couldn't get monitor param: %d\n", i);
return 0; return 0;