PERFORCE change 108544 for review

[Marcel Moolenaar]

http://perforce.freebsd.org/chv.cgi?CH=108544

Change 108544 by marcel at marcel_cluster on 2006/10/27 04:58:46

	Update efinetif.

Affected files ...

.. //depot/projects/ia64/sys/boot/efi/include/efilib.h#7 edit
.. //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#8 edit

Differences ...

==== //depot/projects/ia64/sys/boot/efi/include/efilib.h#7 (text+ko) ====

@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2000 Doug Rabson
+ * Copyright (c) 2006 Marcel Moolenaar
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,6 +37,8 @@
 extern struct devsw efifs_dev;
 extern struct fs_ops efifs_fsops;
 
+extern struct netif_driver efinetif;
+
 void *efi_get_table(EFI_GUID *tbl);
 void efi_main(EFI_HANDLE image_handle, EFI_SYSTEM_TABLE *system_table);
 

==== //depot/projects/ia64/sys/boot/efi/libefi/efinet.c#8 (text+ko) ====

@@ -38,7 +38,24 @@
 #include <efi.h>
 #include <efilib.h>
 
-extern struct netif_driver efi_net;
+static void efinet_end(struct netif *);
+static int efinet_get(struct iodesc *, void *, size_t, time_t);
+static void efinet_init(struct iodesc *, void *);
+static int efinet_match(struct netif *, void *);
+static int efinet_probe(struct netif *, void *);
+static int efinet_put(struct iodesc *, void *, size_t);
+
+struct netif_driver efinetif = {   
+	.netif_bname = "net",
+	.netif_match = efinet_match,
+	.netif_probe = efinet_probe,
+	.netif_init = efinet_init,
+	.netif_get = efinet_get,
+	.netif_put = efinet_put,
+	.netif_end = efinet_end,
+	.netif_ifs = NULL,
+	.netif_nifs = 0
+};
 
 #ifdef EFINET_DEBUG
 static void
@@ -74,21 +91,21 @@
 }
 #endif
 
-int
+static int
 efinet_match(struct netif *nif, void *machdep_hint)
 {
 
 	return (1);
 }
 
-int
+static int
 efinet_probe(struct netif *nif, void *machdep_hint)
 {
 
 	return (0);
 }
 
-int
+static int
 efinet_put(struct iodesc *desc, void *pkt, size_t len)
 {
 	struct netif *nif = desc->io_netif;
@@ -116,8 +133,7 @@
 	return (status == EFI_SUCCESS) ? len : -1;
 }
 
-
-int
+static int
 efinet_get(struct iodesc *desc, void *pkt, size_t len, time_t timeout)
 {
 	struct netif *nif = desc->io_netif;
@@ -152,7 +168,7 @@
 	return 0;
 }
 
-void
+static void
 efinet_init(struct iodesc *desc, void *machdep_hint)
 {
 	struct netif *nif = desc->io_netif;
@@ -229,12 +245,12 @@
 	if (nifs > MAX_INTERFACES)
 		nifs = MAX_INTERFACES;
 
-	efi_net.netif_nifs = nifs;
-	efi_net.netif_ifs = difs;
+	efinetif.netif_nifs = nifs;
+	efinetif.netif_ifs = difs;
 
 	bzero(stats, sizeof(stats));
 	for (i = 0; i < nifs; i++) {
-		struct netif_dif *dif = &efi_net.netif_ifs[i];
+		struct netif_dif *dif = &efinetif.netif_ifs[i];
 		dif->dif_unit = i;
 		dif->dif_nsel = 1;
 		dif->dif_stats = &stats[i];
@@ -246,23 +262,10 @@
 	return;
 }
 
-void
+static void
 efinet_end(struct netif *nif)
 {
 	EFI_SIMPLE_NETWORK *net = nif->nif_devdata;
 
 	net->Shutdown(net);
 }
-
-struct netif_driver efi_net = {
-	"net",			/* netif_bname */
-	efinet_match,		/* netif_match */
-	efinet_probe,		/* netif_probe */
-	efinet_init,		/* netif_init */
-	efinet_get,		/* netif_get */
-	efinet_put,		/* netif_put */
-	efinet_end,		/* netif_end */
-	0,			/* netif_ifs */
-	0			/* netif_nifs */
-};
-