From: Yoshinori Sato <ysato@users.sourceforge.jp>
To: Linus Torvalds <torvalds@osdl.org>
Cc: linux kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] H8/300 include cleanup
Date: Sat, 21 Feb 2004 21:48:26 +0900 [thread overview]
Message-ID: <m2brnsbntx.wl%ysato@users.sourceforge.jp> (raw)
- 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 <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 -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 <asm/machine-depend.h>
+#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
<ysato@usrs.sourceforge.jp>
reply other threads:[~2004-02-21 12:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2brnsbntx.wl%ysato@users.sourceforge.jp \
--to=ysato@users.sourceforge.jp \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.