From 7478d7b804b0c6fd49b32ef7755bc0a619483b18 Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Fri, 20 Feb 2004 17:10:15 -0800 Subject: [PATCH] [PATCH] H8/300 include cleanup - duplicate define marge. - unused define delete. - reduced code size. --- include/asm-h8300/aki3068net/machine-depend.h | 6 ------ include/asm-h8300/h8300_ne.h | 1 + include/asm-h8300/h8max/machine-depend.h | 3 --- include/asm-h8300/system.h | 6 +++--- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/include/asm-h8300/aki3068net/machine-depend.h b/include/asm-h8300/aki3068net/machine-depend.h index e2e5f6a523ace..510b86b5da064 100644 --- 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 #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 c0350b6ea6e36..c797603f3819e 100644 --- a/include/asm-h8300/h8300_ne.h +++ b/include/asm-h8300/h8300_ne.h @@ -13,6 +13,7 @@ #define H8300_NE_DEFINE #include +#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 fbbdb5b004e5f..e87d22e6d7a49 100644 --- 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 c2d2457b138c6..2a29101adaa70 100644 --- 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); \ }) -- 2.53.0