diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/sgi/include/autoconf.h | 10 | ||||
| -rw-r--r-- | sys/arch/sgi/include/bus.h | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/include/exec.h | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/include/intr.h | 6 | ||||
| -rw-r--r-- | sys/arch/sgi/include/psl.h | 8 | ||||
| -rw-r--r-- | sys/arch/sgi/include/rm7000.h | 10 |
6 files changed, 24 insertions, 24 deletions
diff --git a/sys/arch/sgi/include/autoconf.h b/sys/arch/sgi/include/autoconf.h index 132b7360066..9e626c453b3 100644 --- a/sys/arch/sgi/include/autoconf.h +++ b/sys/arch/sgi/include/autoconf.h @@ -1,8 +1,8 @@ -/* $OpenBSD: autoconf.h,v 1.4 2004/08/10 12:33:21 pefo Exp $ */ +/* $OpenBSD: autoconf.h,v 1.5 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 2001-2003 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -73,13 +73,13 @@ struct sys_rec { bus_addr_t cons_ioaddr[8]; /* up to eight loclbus tty's */ }; -extern struct sys_rec sys_config; +extern struct sys_rec sys_config; /* * Give com.c method to find console address and speeds */ -#define COM_FREQ (sys_config.cons_baudclk) -#define CONCOM_FREQ (sys_config.cons_baudclk) +#define COM_FREQ (sys_config.cons_baudclk) +#define CONCOM_FREQ (sys_config.cons_baudclk) #define CONADDR (sys_config.cons_ioaddr[0]) diff --git a/sys/arch/sgi/include/bus.h b/sys/arch/sgi/include/bus.h index d1ec5c94d4a..2b8f6f45aff 100644 --- a/sys/arch/sgi/include/bus.h +++ b/sys/arch/sgi/include/bus.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bus.h,v 1.1 2004/08/06 21:12:18 pefo Exp $ */ +/* $OpenBSD: bus.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB Sweden. All rights reserved. @@ -255,11 +255,11 @@ bus_space_copy_4(void *v, bus_space_handle_t h1, bus_size_t o1, * void bus_space_barrier(bus_space_tag_t tag, * bus_space_handle_t bsh, bus_size_t offset, * bus_size_t len, int flags); - * + * */ #define bus_space_barrier(t, h, o, l, f) \ - ((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f))) -#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ + ((void)((void)(t), (void)(h), (void)(o), (void)(l), (void)(f))) +#define BUS_SPACE_BARRIER_READ 0x01 /* force read barrier */ #define BUS_SPACE_BARRIER_WRITE 0x02 /* force write barrier */ /* Compatibility defines */ #define BUS_BARRIER_READ BUS_SPACE_BARRIER_READ diff --git a/sys/arch/sgi/include/exec.h b/sys/arch/sgi/include/exec.h index 75242789a88..853859b6046 100644 --- a/sys/arch/sgi/include/exec.h +++ b/sys/arch/sgi/include/exec.h @@ -1,8 +1,8 @@ -/* $OpenBSD: exec.h,v 1.2 2004/08/09 14:57:26 pefo Exp $ */ +/* $OpenBSD: exec.h,v 1.3 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 1996-2003 Per Fogelstrom - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -63,7 +63,7 @@ /* Information taken from MIPS ABI supplemental */ -/* Architecture dependent Segment types - p_type */ +/* Architecture dependent Segment types - p_type */ #define PT_MIPS_REGINFO 0x70000000 /* Register usage information */ /* Architecture dependent d_tag field for Elf32_Dyn. */ diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h index 23754885270..26e8fb95232 100644 --- a/sys/arch/sgi/include/intr.h +++ b/sys/arch/sgi/include/intr.h @@ -1,8 +1,8 @@ -/* $OpenBSD: intr.h,v 1.1 2004/08/06 21:12:19 pefo Exp $ */ +/* $OpenBSD: intr.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -247,7 +247,7 @@ extern void *hwmask_addr; */ void *generic_intr_establish(void *, u_long, int, int, - int (*) __P((void *)), void *, char *); + int (*) __P((void *)), void *, char *); void generic_intr_disestablish(void *, void *); void generic_intr_makemasks(void); void generic_do_pending_int(void); diff --git a/sys/arch/sgi/include/psl.h b/sys/arch/sgi/include/psl.h index 307ebaa88a5..d58f97d35c7 100644 --- a/sys/arch/sgi/include/psl.h +++ b/sys/arch/sgi/include/psl.h @@ -1,8 +1,8 @@ -/* $OpenBSD: psl.h,v 1.1 2004/08/06 21:12:19 pefo Exp $ */ +/* $OpenBSD: psl.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -31,8 +31,8 @@ * Macros to decode processor status word. */ #define USERMODE(ps) (((ps) & SR_KSU_MASK) == SR_KSU_USER) -#define BASEPRI(ps) (((ps) & (INT_MASK | SR_INT_ENA_PREV)) \ - == (INT_MASK | SR_INT_ENA_PREV)) +#define BASEPRI(ps) (((ps) & (INT_MASK | SR_INT_ENA_PREV)) == \ + (INT_MASK | SR_INT_ENA_PREV)) #ifdef _KERNEL #include <machine/intr.h> diff --git a/sys/arch/sgi/include/rm7000.h b/sys/arch/sgi/include/rm7000.h index 2fd5584e72e..141d1ada575 100644 --- a/sys/arch/sgi/include/rm7000.h +++ b/sys/arch/sgi/include/rm7000.h @@ -1,8 +1,8 @@ -/* $OpenBSD: rm7000.h,v 1.1 2004/08/06 21:12:19 pefo Exp $ */ +/* $OpenBSD: rm7000.h,v 1.2 2004/08/10 18:52:58 deraadt Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -26,8 +26,8 @@ * */ -#ifndef _MACHINE_RM7000_H -#define _MACHINE_RM7000_H +#ifndef _MACHINE_RM7000_H +#define _MACHINE_RM7000_H /* * QED RM7000 specific defines. @@ -70,7 +70,7 @@ #define PCNT_SRC_ELDSTALL 0x1d /* Excepion stall due to non-b ld */ #define PCNT_SRC_MAX 0x1d /* Maximum PCNT select code */ -/* +/* * Counter control bits. */ |