diff options
Diffstat (limited to 'sys/arm/include')
| -rw-r--r-- | sys/arm/include/_align.h | 45 | ||||
| -rw-r--r-- | sys/arm/include/_limits.h | 2 | ||||
| -rw-r--r-- | sys/arm/include/limits.h | 2 | ||||
| -rw-r--r-- | sys/arm/include/signal.h | 2 | ||||
| -rw-r--r-- | sys/arm/include/stdarg.h | 2 |
5 files changed, 30 insertions, 23 deletions
diff --git a/sys/arm/include/_align.h b/sys/arm/include/_align.h index e382fe2ac311e..2f715fbb3e199 100644 --- a/sys/arm/include/_align.h +++ b/sys/arm/include/_align.h @@ -1,5 +1,4 @@ /*- - * Copyright (c) 2001 David E. O'Brien * Copyright (c) 1990 The Regents of the University of California. * All rights reserved. * @@ -14,11 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -34,23 +29,35 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * from: @(#)param.h 5.8 (Berkeley) 6/28/91 + * from: @(#)isa.h 5.7 (Berkeley) 5/9/91 * $FreeBSD$ */ -#ifndef _ARM_INCLUDE__ALIGN_H_ -#define _ARM_INCLUDE__ALIGN_H_ +#ifndef _PC98_PC98_PC98_H_ +#define _PC98_PC98_PC98_H_ /* - * Round p (pointer or byte index) up to the hardware-required alignment which - * is sufficient for any data type, pointer or numeric. The resulting type - * is equivelent to arm's uintptr_t (but is purposely spelled "unsigned" here). + * PC98 Bus conventions + * modified for PC9801 by A.Kojima F.Ukai M.Ishii + * Kyoto University Microcomputer Club (KMC) */ -#if __ARM_ARCH >= 6 -#define _ALIGNBYTES (sizeof(int) - 1) -#else -#define _ALIGNBYTES (sizeof(long long) - 1) -#endif -#define _ALIGN(p) (((unsigned)(p) + _ALIGNBYTES) & ~_ALIGNBYTES) -#endif /* !_ARM_INCLUDE__ALIGN_H_ */ +/* + * Input / Output Port Assignments -- PC98 IO address ... very dirty (^_^; + */ + +#define IO_ICU1 0x000 /* 8259A Interrupt Controller #1 */ +#define IO_ICU2 0x008 /* 8259A Interrupt Controller #2 */ +#define IO_RTC 0x020 /* 4990A RTC */ +#define IO_SYSPORT 0x031 /* 8255A System Port */ +#define IO_KBD 0x041 /* 8251A Keyboard */ +#define IO_COM2 0x0B1 /* 8251A RS232C serial I/O (ext) */ +#define IO_COM3 0x0B9 /* 8251A RS232C serial I/O (ext) */ +#define IO_FDPORT 0x0BE /* FD I/F port (1M<->640K,EMTON) */ + +/* + * Input / Output Port Sizes + */ +#define IO_KBDSIZE 16 /* 8042 Keyboard controllers */ + +#endif /* !_PC98_PC98_PC98_H_ */ diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h index 8cb84649b1004..8de8d444593ea 100644 --- a/sys/arm/include/_limits.h +++ b/sys/arm/include/_limits.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sys/arm/include/limits.h b/sys/arm/include/limits.h index 35eea1f619dee..9b5544419888c 100644 --- a/sys/arm/include/limits.h +++ b/sys/arm/include/limits.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sys/arm/include/signal.h b/sys/arm/include/signal.h index 4b6fa37b2241c..6c8ac5cabab54 100644 --- a/sys/arm/include/signal.h +++ b/sys/arm/include/signal.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * diff --git a/sys/arm/include/stdarg.h b/sys/arm/include/stdarg.h index 8020d8d140c24..bc8e7cd69cbcb 100644 --- a/sys/arm/include/stdarg.h +++ b/sys/arm/include/stdarg.h @@ -11,7 +11,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * |