Commit 698e4170 authored by Stewart Brodie's avatar Stewart Brodie
Browse files

No longer assumes that it should attach itself to eh0 if it cannot find a driver.

Detail:
  The module used to have specific knowledge of the driver to which it
    was supposed to bind if it was unable to find any active drivers at
    the time that LanManFS was initialised.  This meant that if the
    LanManFS module was placed in ROM (eg. in STB3) and the drivers
    hadn't initialised by the time that LanManFS was initialised, it
    would sit and wait for EtherH to arrive - which doesn't happen
    for ATM solutions, and doesn't happen for Ethernet in STB3 because
    we no longer use EtherH!
Admin:
  Tested in STB22 expansion cards, and in STB3 ROM builds for both
    Ethernet and ATM solutions.

Version 2.05. Tagged as 'LanManFS-2_05'
parent feb9328e
/* (2.04)
/* (2.05)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 2.04
#define Module_MajorVersion_CMHG 2.05
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 09 Mar 1999
#define Module_Date_CMHG 16 Mar 1999
#define Module_MajorVersion "2.04"
#define Module_Version 204
#define Module_MajorVersion "2.05"
#define Module_Version 205
#define Module_MinorVersion ""
#define Module_Date "09 Mar 1999"
#define Module_Date "16 Mar 1999"
......@@ -62,7 +62,7 @@
/* Added SNB 980224 */
extern char *LM_Status(void);
#define DEFAULT_ETHER_TYPE "eh0"
#define DEFAULT_ETHER_TYPE "_default_"
typedef void (*pfnShutdown)(void);
typedef void (*pfnTransportInit)(void);
......@@ -807,9 +807,7 @@ void LM_Service ( int service_number, _kernel_swi_regs *r, void *pw )
break;
case Service_DCIDriverStatus:
if (NB_InitedTransport == NB_NetBEUI_Setup) {
LM_check_driver_status(r);
}
LM_check_driver_status(r);
break;
case Service_InternetStatus:
......@@ -1217,7 +1215,18 @@ static void LM_check_driver_status(_kernel_swi_regs *r)
printf ("We are looking for driver `%s' - got `%s'\n", LM_Vars.drivername,
if_name);
#endif
if (strcmp(LM_Vars.drivername, DEFAULT_ETHER_TYPE) == 0) {
if (if_name[0] != 'l') {
(void) strncpy(LM_Vars.drivername, if_name, NAME_LIMIT);
}
}
if (NB_InitedTransport != NB_NetBEUI_Setup) {
return;
}
if (stricmp(LM_Vars.drivername, if_name) != 0) {
/* printf("Not interested\n"); */
......
......@@ -337,9 +337,10 @@ Err60 DCD Err_Base+60
ALIGN
Err61 DCD Err_Base+61
DCB "User account has been disabled", 0
ALIGN
Err62 DCD Err_Base+62
DCB "LanManFS in use", 0
ALIGN
END
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment