[PATCH] H8/300 include cleanup

- duplicate define marge.
- unused define delete.
- reduced code size.

diff --git a/include/asm-h8300/aki3068net/machine-depend.h b/include/asm-h8300/aki3068net/machine-depend.h
index e2e5f6a523acef8697a652636dd0cd8c09ba214b..510b86b5da0643f143454612863abdeda1833a64 100644 (file)
--- a/include/asm-h8300/aki3068net/machine-depend.h
+++ b/include/asm-h8300/aki3068net/machine-depend.h
@@ -2,7 +2,6 @@
 
 /* TIMER rate define */
 #ifdef H8300_TIMER_DEFINE
-#include <linux/config.h>
 #define H8300_TIMER_COUNT_DATA 20000*10/8192
 #define H8300_TIMER_FREQ 20000*1000/8192
 #endif
@@ -12,13 +11,8 @@
 
 #define NE2000_ADDR            0x200000
 #define NE2000_IRQ              5
-#define NE2000_IRQ_VECTOR      (12 + NE2000_IRQ)
 #define        NE2000_BYTE             volatile unsigned short
 
-#define IER                     0xfee015
-#define ISR                    0xfee016
-#define IRQ_MASK               (1 << NE2000_IRQ)
-
 #define WCRL                    0xfee023
 #define MAR0A                   0xffff20
 #define ETCR0A                  0xffff24

diff --git a/include/asm-h8300/h8300_ne.h b/include/asm-h8300/h8300_ne.h
index c0350b6ea6e36e3be2c4fe3141e6e99536f6aa60..c797603f3819e6510a897fa9718e20afec21db1d 100644 (file)
--- a/include/asm-h8300/h8300_ne.h
+++ b/include/asm-h8300/h8300_ne.h
@@ -13,6 +13,7 @@
 
 #define H8300_NE_DEFINE
 #include <asm/machine-depend.h>
+#define NE2000_IRQ_VECTOR      (12 + NE2000_IRQ)
 #undef  H8300_NE_DEFINE
 
 /****************************************************************************/

diff --git a/include/asm-h8300/h8max/machine-depend.h b/include/asm-h8300/h8max/machine-depend.h
index fbbdb5b004e5fc24ea5183f3f68bdef1e824d7ec..e87d22e6d7a4977896c5ff8a677200b72645ea71 100644 (file)
--- a/include/asm-h8300/h8max/machine-depend.h
+++ b/include/asm-h8300/h8max/machine-depend.h
@@ -14,9 +14,6 @@
 #define NE2000_IRQ_VECTOR      (12 + NE2000_IRQ)
 #define        NE2000_BYTE             volatile unsigned short
 
-#define IER                     0xfee015
-#define ISR                    0xfee016
-#define IRQ_MASK               (1 << NE2000_IRQ)
 /* sorry quick hack */
 #if defined(outb)
 # undef outb

diff --git a/include/asm-h8300/system.h b/include/asm-h8300/system.h
index c2d2457b138c62729e11e98046a4a67608b959bd..2a29101adaa706e74416b1dfe12e801710b6af78 100644 (file)
--- a/include/asm-h8300/system.h
+++ b/include/asm-h8300/system.h
@@ -57,14 +57,14 @@ asmlinkage void resume(void);
 #define __cli() asm volatile ("orc  #0x80,ccr")
 
 #define __save_flags(x) \
-       asm volatile ("stc ccr,r0l\n\tmov.l er0,%0":"=r" (x) : : "er0")
+       asm volatile ("stc ccr,%w0":"=r" (x))
 
 #define __restore_flags(x) \
-       asm volatile ("mov.l %0,er0\n\tldc r0l,ccr": :"r" (x) : "er0")
+       asm volatile ("ldc %w0,ccr": :"r" (x))
 
 #define        irqs_disabled()                 \
 ({                                     \
-       unsigned long flags;            \
+       unsigned char flags;            \
        __save_flags(flags);            \
        ((flags & 0x80) == 0x80);       \
 })