Move the Multiboot code around to have more sane filenames.

[netwatch.git] / net / etherboot-compat.h

diff --git a/net/etherboot-compat.h b/net/etherboot-compat.h
index 2d8d98fb47efb3ad40588810a44988a29bb75c1a..d56dce5c9ae821b4599f1af873e3e895fcb5f96e 100644 (file)
--- a/net/etherboot-compat.h
+++ b/net/etherboot-compat.h
@@ -1,6 +1,20 @@
+/* etherboot-compat.h
+ * EtherBoot driver compatibility routines
+ * NetWatch system management mode administration console
+ *
+ * Copyright (c) 2008 Jacob Potter and Joshua Wise.  All rights reserved.
+ * This program is free software; you can redistribute and/or modify it under
+ * the terms found in the file LICENSE in the root of this source tree.
+ *
+ */
+
+
 #ifndef _ETHERBOOT_COMPAT_H
 #define _ETHERBOOT_COMPAT_H
 
+#include <paging.h>
+#include "lwip/pbuf.h"
+
 #define ETH_ALEN       6
 
 struct dev {
@@ -13,11 +27,13 @@ struct nic {
 
        unsigned int ioaddr;
        unsigned int irqno;
+       
+       unsigned char hwaddr[6];
 
-       int (*poll) (struct nic *nic, int retrieve);
-       void (*transmit) (const char *dest_addr, unsigned int proto, unsigned int size, const char *pkt);
+       int (*recv) (struct nic *nic);
+       void (*transmit) (struct nic *nic, struct pbuf *p);
 };
 
-#define virt_to_bus(x) ((unsigned long)x)
+#define virt_to_bus(x) memory_v2p((void *)(x))
 
 #endif