summaryrefslogtreecommitdiff
path: root/sys/arch/atari/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/atari/dev')
-rw-r--r--sys/arch/atari/dev/atari5380.c6
-rw-r--r--sys/arch/atari/dev/clock.c8
-rw-r--r--sys/arch/atari/dev/hdfd.c8
3 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/atari/dev/atari5380.c b/sys/arch/atari/dev/atari5380.c
index 7db50a590eb..bea67a19136 100644
--- a/sys/arch/atari/dev/atari5380.c
+++ b/sys/arch/atari/dev/atari5380.c
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.38 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: atari5380.c,v 1.39 2005/12/24 20:06:58 perry Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.38 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.39 2005/12/24 20:06:58 perry Exp $");
#include "opt_atariscsi.h"
@@ -558,7 +558,7 @@ extern int *nofault;
*/
SCSI_DMA->s_hdma_ctrl |= SDH_BUSERR;
}
- __asm __volatile ("tstb %0@(0)": : "a" (dma_ptr));
+ __asm volatile ("tstb %0@(0)": : "a" (dma_ptr));
nofault = (int *)0;
}
diff --git a/sys/arch/atari/dev/clock.c b/sys/arch/atari/dev/clock.c
index 2ab062498bf..fd54d89dbf4 100644
--- a/sys/arch/atari/dev/clock.c
+++ b/sys/arch/atari/dev/clock.c
@@ -1,4 +1,4 @@
-/* $NetBSD: clock.c,v 1.36 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.36 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.37 2005/12/24 20:06:58 perry Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -355,9 +355,9 @@ int n;
{
u_int temp;
- __asm __volatile ("mulul %2,%1:%0" : "=d" (n), "=d" (temp)
+ __asm volatile ("mulul %2,%1:%0" : "=d" (n), "=d" (temp)
: "d" (TIMB_FREQ), "d" (n));
- __asm __volatile ("divul %1,%2:%0" : "=d" (n)
+ __asm volatile ("divul %1,%2:%0" : "=d" (n)
: "d"(1000000),"d"(temp),"0"(n));
}
diff --git a/sys/arch/atari/dev/hdfd.c b/sys/arch/atari/dev/hdfd.c
index ae7f617ae7a..3bd84f90c4e 100644
--- a/sys/arch/atari/dev/hdfd.c
+++ b/sys/arch/atari/dev/hdfd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: hdfd.c,v 1.47 2005/12/11 12:16:54 christos Exp $ */
+/* $NetBSD: hdfd.c,v 1.48 2005/12/24 20:06:58 perry Exp $ */
/*-
* Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.47 2005/12/11 12:16:54 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.48 2005/12/24 20:06:58 perry Exp $");
#include "opt_ddb.h"
@@ -319,7 +319,7 @@ static void fdgetdisklabel __P((struct fd_softc *, dev_t));
static void fdgetdefaultlabel __P((struct fd_softc *, struct disklabel *,
int));
-__inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
+inline struct fd_type *fd_dev_to_type __P((struct fd_softc *, dev_t));
int
fdcprobe(parent, cfp, aux)
@@ -590,7 +590,7 @@ fdc_ctrl_intr(frame)
}
}
-__inline struct fd_type *
+inline struct fd_type *
fd_dev_to_type(fd, dev)
struct fd_softc *fd;
dev_t dev;