ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/Windows/ether_windows.cpp
(Generate patch)

Comparing BasiliskII/src/Windows/ether_windows.cpp (file contents):
Revision 1.7 by gbeauche, 2006-05-01T10:23:47Z vs.
Revision 1.9 by gbeauche, 2008-01-01T09:40:33Z

# Line 1 | Line 1
1   /*
2   *  ether_windows.cpp - Ethernet device driver
3   *
4 < *  Basilisk II (C) 1997-2005 Christian Bauer
4 > *  Basilisk II (C) 1997-2008 Christian Bauer
5   *
6   *  Windows platform specific code copyright (C) Lauri Pesonen
7   *
# Line 230 | Line 230 | bool ether_init(void)
230  
231          // Determine Ethernet device type
232          net_if_type = -1;
233 <        if (strcmp(name, "router") == 0)
233 >        if (PrefsFindBool("routerenabled") || strcmp(name, "router") == 0)
234                  net_if_type = NET_IF_ROUTER;
235          else if (strcmp(name, "slirp") == 0)
236                  net_if_type = NET_IF_SLIRP;
# Line 259 | Line 259 | bool ether_init(void)
259          switch (net_if_type) {
260          case NET_IF_B2ETHER:
261                  dev_name = PrefsFindString("etherguid");
262 +                if (dev_name == NULL || strcmp(name, "b2ether") != 0)
263 +                        dev_name = name;
264                  break;
265          case NET_IF_TAP:
266                  dev_name = PrefsFindString("etherguid");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines