diff options
| author | Michael Brown | 2005-05-02 18:21:52 +0200 |
|---|---|---|
| committer | Michael Brown | 2005-05-02 18:21:52 +0200 |
| commit | 60b82eb5cdfeea33cddc7740a3eb30d41d4192a4 (patch) | |
| tree | 34883b316032f86d1b200d0ae7680aa3e3156307 /src | |
| parent | Correct symbol violations reported by "make symcheck" (diff) | |
| download | ipxe-60b82eb5cdfeea33cddc7740a3eb30d41d4192a4.tar.gz ipxe-60b82eb5cdfeea33cddc7740a3eb30d41d4192a4.tar.xz ipxe-60b82eb5cdfeea33cddc7740a3eb30d41d4192a4.zip | |
Moved definition of __shared into compiler.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/drivers/net/sundance.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/tg3.c | 1 | ||||
| -rw-r--r-- | src/include/compiler.h | 17 | ||||
| -rw-r--r-- | src/include/shared.h | 21 |
4 files changed, 17 insertions, 23 deletions
diff --git a/src/drivers/net/sundance.c b/src/drivers/net/sundance.c index 6fc3208ed..05621d4f2 100644 --- a/src/drivers/net/sundance.c +++ b/src/drivers/net/sundance.c @@ -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" diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c index b420a64bf..2d881f08a 100644 --- a/src/drivers/net/tg3.c +++ b/src/drivers/net/tg3.c @@ -16,7 +16,6 @@ #include "pci.h" #include "timer.h" #include "string.h" -#include "shared.h" #include "tg3.h" #define SUPPORT_COPPER_PHY 1 diff --git a/src/include/compiler.h b/src/include/compiler.h index 4fe4f025d..df0a01a6e 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h @@ -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 index 2cad391a6..000000000 --- a/src/include/shared.h +++ /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 */ |