Moved definition of __shared into compiler.h
authorMichael Brown <mcb30@etherboot.org>
Mon, 2 May 2005 16:21:52 +0000 (16:21 +0000)
committerMichael Brown <mcb30@etherboot.org>
Mon, 2 May 2005 16:21:52 +0000 (16:21 +0000)
src/drivers/net/sundance.c
src/drivers/net/tg3.c
src/include/compiler.h
src/include/shared.h [deleted file]

index 6fc3208..05621d4 100644 (file)
@@ -48,7 +48,6 @@
 #include "pci.h"
 #include "timer.h"
 #include "mii.h"
-#include "shared.h"
 
 #define drv_version "v1.12"
 #define drv_date "2004-03-21"
index b420a64..2d881f0 100644 (file)
@@ -16,7 +16,6 @@
 #include "pci.h"
 #include "timer.h"
 #include "string.h"
-#include "shared.h"
 #include "tg3.h"
 
 #define SUPPORT_COPPER_PHY  1
index 4fe4f02..df0a01a 100644 (file)
@@ -71,6 +71,23 @@ __asm__ ( ".equ\tDEBUG_LEVEL, " DEBUG_SYMBOL_STR );
 #define __unused __attribute__((unused))
 #define __used __attribute__((used))
 
+/*
+ * To save space in the binary when multiple-driver images are
+ * compiled, uninitialised data areas can be shared between drivers.
+ * This will typically be used to share statically-allocated receive
+ * and transmit buffers between drivers.
+ *
+ * Use as e.g.
+ *
+ *  struct {
+ *     char    rx_buf[NUM_RX_BUF][RX_BUF_SIZE];
+ *     char    tx_buf[TX_BUF_SIZE];
+ *  } my_static_data __shared;
+ *
+ */
+
+#define __shared __asm__ ( "_shared_bss" );
+
 #endif /* ASSEMBLY */
 
 #endif /* COMPILER_H */
diff --git a/src/include/shared.h b/src/include/shared.h
deleted file mode 100644 (file)
index 2cad391..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#ifndef SHARED_H
-#define SHARED_H
-
-/*
- * To save space in the binary when multiple-driver images are
- * compiled, uninitialised data areas can be shared between drivers.
- * This will typically be used to share statically-allocated receive
- * and transmit buffers between drivers.
- *
- * Use as e.g.
- *
- *  struct {
- *     char    rx_buf[NUM_RX_BUF][RX_BUF_SIZE];
- *     char    tx_buf[TX_BUF_SIZE];
- *  } my_static_data __shared;
- *
- */
-
-#define __shared __asm__ ( "_shared_bss" );
-
-#endif /* SHARED_H */