saying ether=type=i82574 is no longer necessary. it can be specified via tbdf either through automatic configuration, or manually. either way, the old method has no advantages, and is in every case redundant Reference: /n/atom/patch/applied2013/ether63notypes Date: Sat Oct 12 21:33:09 CES 2013 Signed-off-by: quanstro@quanstro.net --- /sys/src/9/pc/ether82563.c Sat Oct 12 21:32:02 2013 +++ /sys/src/9/pc/ether82563.c Sat Oct 12 21:32:04 2013 @@ -2114,133 +2114,8 @@ return pnp(e, -1); } -static int -i82563pnp(Ether *e) -{ - return pnp(e, i82563); -} - -static int -i82566pnp(Ether *e) -{ - return pnp(e, i82566); -} - -static int -i82567pnp(Ether *e) -{ - return pnp(e, i82567m) & pnp(e, i82567); -} - -static int -i82571pnp(Ether *e) -{ - return pnp(e, i82571); -} - -static int -i82572pnp(Ether *e) -{ - return pnp(e, i82572); -} - -static int -i82573pnp(Ether *e) -{ - return pnp(e, i82573); -} - -static int -i82574pnp(Ether *e) -{ - return pnp(e, i82574); -} - -static int -i82575pnp(Ether *e) -{ - return pnp(e, i82575); -} - -static int -i82576pnp(Ether *e) -{ - return pnp(e, i82576); -} - -static int -i82577pnp(Ether *e) -{ - return pnp(e, i82577m) & pnp(e, i82577); -} - -static int -i82578pnp(Ether *e) -{ - return pnp(e, i82578m) & pnp(e, i82578); -} - -static int -i82579pnp(Ether *e) -{ - return pnp(e, i82579); -} - -static int -i82580pnp(Ether *e) -{ - return pnp(e, i82580); -} - -static int -i82583pnp(Ether *e) -{ - return pnp(e, i82583); -} - -static int -i210pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i217pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i350pnp(Ether *e) -{ - return pnp(e, i350); -} - void ether82563link(void) { - /* - * recognise lots of model numbers for debugging - * also good for forcing onboard nic(s) as ether0 - * try to make that unnecessary by listing lom first. - */ - addethercard("i82563", i82563pnp); - addethercard("i82566", i82566pnp); - addethercard("i82574", i82574pnp); - addethercard("i82576", i82576pnp); - addethercard("i82567", i82567pnp); - addethercard("i82573", i82573pnp); - - addethercard("i82571", i82571pnp); - addethercard("i82572", i82572pnp); - addethercard("i82575", i82575pnp); - addethercard("i82577", i82577pnp); - addethercard("i82578", i82578pnp); - addethercard("i82579", i82579pnp); - addethercard("i82580", i82580pnp); - addethercard("i82583", i82583pnp); - addethercard("i210", i210pnp); - addethercard("i217", i217pnp); - addethercard("i350", i350pnp); - addethercard("igbepcie", anypnp); + addethercard("i82563", anypnp); } --- /sys/src/9/pcpae/ether82563.c Sat Oct 12 21:32:06 2013 +++ /sys/src/9/pcpae/ether82563.c Sat Oct 12 21:32:08 2013 @@ -2114,133 +2114,8 @@ return pnp(e, -1); } -static int -i82563pnp(Ether *e) -{ - return pnp(e, i82563); -} - -static int -i82566pnp(Ether *e) -{ - return pnp(e, i82566); -} - -static int -i82567pnp(Ether *e) -{ - return pnp(e, i82567m) & pnp(e, i82567); -} - -static int -i82571pnp(Ether *e) -{ - return pnp(e, i82571); -} - -static int -i82572pnp(Ether *e) -{ - return pnp(e, i82572); -} - -static int -i82573pnp(Ether *e) -{ - return pnp(e, i82573); -} - -static int -i82574pnp(Ether *e) -{ - return pnp(e, i82574); -} - -static int -i82575pnp(Ether *e) -{ - return pnp(e, i82575); -} - -static int -i82576pnp(Ether *e) -{ - return pnp(e, i82576); -} - -static int -i82577pnp(Ether *e) -{ - return pnp(e, i82577m) & pnp(e, i82577); -} - -static int -i82578pnp(Ether *e) -{ - return pnp(e, i82578m) & pnp(e, i82578); -} - -static int -i82579pnp(Ether *e) -{ - return pnp(e, i82579); -} - -static int -i82580pnp(Ether *e) -{ - return pnp(e, i82580); -} - -static int -i82583pnp(Ether *e) -{ - return pnp(e, i82583); -} - -static int -i210pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i217pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i350pnp(Ether *e) -{ - return pnp(e, i350); -} - void ether82563link(void) { - /* - * recognise lots of model numbers for debugging - * also good for forcing onboard nic(s) as ether0 - * try to make that unnecessary by listing lom first. - */ - addethercard("i82563", i82563pnp); - addethercard("i82566", i82566pnp); - addethercard("i82574", i82574pnp); - addethercard("i82576", i82576pnp); - addethercard("i82567", i82567pnp); - addethercard("i82573", i82573pnp); - - addethercard("i82571", i82571pnp); - addethercard("i82572", i82572pnp); - addethercard("i82575", i82575pnp); - addethercard("i82577", i82577pnp); - addethercard("i82578", i82578pnp); - addethercard("i82579", i82579pnp); - addethercard("i82580", i82580pnp); - addethercard("i82583", i82583pnp); - addethercard("i210", i210pnp); - addethercard("i217", i217pnp); - addethercard("i350", i350pnp); - addethercard("igbepcie", anypnp); + addethercard("i82563", anypnp); } --- /sys/src/nix/k10/ether82563.c Sat Oct 12 21:32:11 2013 +++ /sys/src/nix/k10/ether82563.c Sat Oct 12 21:32:13 2013 @@ -2114,133 +2114,8 @@ return pnp(e, -1); } -static int -i82563pnp(Ether *e) -{ - return pnp(e, i82563); -} - -static int -i82566pnp(Ether *e) -{ - return pnp(e, i82566); -} - -static int -i82567pnp(Ether *e) -{ - return pnp(e, i82567m) & pnp(e, i82567); -} - -static int -i82571pnp(Ether *e) -{ - return pnp(e, i82571); -} - -static int -i82572pnp(Ether *e) -{ - return pnp(e, i82572); -} - -static int -i82573pnp(Ether *e) -{ - return pnp(e, i82573); -} - -static int -i82574pnp(Ether *e) -{ - return pnp(e, i82574); -} - -static int -i82575pnp(Ether *e) -{ - return pnp(e, i82575); -} - -static int -i82576pnp(Ether *e) -{ - return pnp(e, i82576); -} - -static int -i82577pnp(Ether *e) -{ - return pnp(e, i82577m) & pnp(e, i82577); -} - -static int -i82578pnp(Ether *e) -{ - return pnp(e, i82578m) & pnp(e, i82578); -} - -static int -i82579pnp(Ether *e) -{ - return pnp(e, i82579); -} - -static int -i82580pnp(Ether *e) -{ - return pnp(e, i82580); -} - -static int -i82583pnp(Ether *e) -{ - return pnp(e, i82583); -} - -static int -i210pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i217pnp(Ether *e) -{ - return pnp(e, i210); -} - -static int -i350pnp(Ether *e) -{ - return pnp(e, i350); -} - void ether82563link(void) { - /* - * recognise lots of model numbers for debugging - * also good for forcing onboard nic(s) as ether0 - * try to make that unnecessary by listing lom first. - */ - addethercard("i82563", i82563pnp); - addethercard("i82566", i82566pnp); - addethercard("i82574", i82574pnp); - addethercard("i82576", i82576pnp); - addethercard("i82567", i82567pnp); - addethercard("i82573", i82573pnp); - - addethercard("i82571", i82571pnp); - addethercard("i82572", i82572pnp); - addethercard("i82575", i82575pnp); - addethercard("i82577", i82577pnp); - addethercard("i82578", i82578pnp); - addethercard("i82579", i82579pnp); - addethercard("i82580", i82580pnp); - addethercard("i82583", i82583pnp); - addethercard("i210", i210pnp); - addethercard("i217", i217pnp); - addethercard("i350", i350pnp); - addethercard("igbepcie", anypnp); + addethercard("i82563", anypnp); }