From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261553AbUBUMuw (ORCPT ); Sat, 21 Feb 2004 07:50:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261551AbUBUMsy (ORCPT ); Sat, 21 Feb 2004 07:48:54 -0500 Received: from p062096.ppp.asahi-net.or.jp ([221.113.62.96]:7162 "EHLO mitou.ysato.dip.jp") by vger.kernel.org with ESMTP id S261552AbUBUMse (ORCPT ); Sat, 21 Feb 2004 07:48:34 -0500 Date: Sat, 21 Feb 2004 21:48:26 +0900 Message-ID: From: Yoshinori Sato To: Linus Torvalds Cc: linux kernel Mailing List Subject: [PATCH] H8/300 include cleanup User-Agent: Wanderlust/2.11.20 (Wonderwall) SEMI/1.14.5 (Awara-Onsen) LIMIT/1.14.7 (Fujiidera) APEL/10.6 Emacs/21.3 (i386-pc-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.5 - "Awara-Onsen") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org - duplicate define marge. - unused define delete. - reduced code size. diff -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/aki3068net/machine-depend.h linux-2.6.3-h8300/include/asm-h8300/aki3068net/machine-depend.h --- linux-2.6.3/include/asm-h8300/aki3068net/machine-depend.h 2004-01-09 15:59:56.000000000 +0900 +++ linux-2.6.3-h8300/include/asm-h8300/aki3068net/machine-depend.h 2004-02-20 02:44:28.000000000 +0900 @@ -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 -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/h8300_ne.h linux-2.6.3-h8300/include/asm-h8300/h8300_ne.h --- linux-2.6.3/include/asm-h8300/h8300_ne.h 2004-01-09 15:59:19.000000000 +0900 +++ linux-2.6.3-h8300/include/asm-h8300/h8300_ne.h 2004-02-20 02:43:02.000000000 +0900 @@ -13,6 +13,7 @@ #define H8300_NE_DEFINE #include +#define NE2000_IRQ_VECTOR (12 + NE2000_IRQ) #undef H8300_NE_DEFINE /****************************************************************************/ diff -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/h8max/machine-depend.h linux-2.6.3-h8300/include/asm-h8300/h8max/machine-depend.h --- linux-2.6.3/include/asm-h8300/h8max/machine-depend.h 2004-01-09 15:59:47.000000000 +0900 +++ linux-2.6.3-h8300/include/asm-h8300/h8max/machine-depend.h 2004-02-20 02:44:41.000000000 +0900 @@ -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 -X .exclude-diff -Nru linux-2.6.3/include/asm-h8300/system.h linux-2.6.3-h8300/include/asm-h8300/system.h --- linux-2.6.3/include/asm-h8300/system.h 2004-01-09 15:59:27.000000000 +0900 +++ linux-2.6.3-h8300/include/asm-h8300/system.h 2004-02-20 01:50:32.000000000 +0900 @@ -57,14 +57,14 @@ #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); \ }) -- Yoshinori Sato