Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/atari/dev Misc KNF and cosmetics.
details: https://anonhg.NetBSD.org/src/rev/a39fa98d5a24
branches: trunk
changeset: 753906:a39fa98d5a24
user: tsutsui <tsutsui%NetBSD.org@localhost>
date: Tue Apr 13 13:30:37 2010 +0000
description:
Misc KNF and cosmetics.
diffstat:
sys/arch/atari/dev/atari5380.c | 380 ++++++++-------
sys/arch/atari/dev/ncr5380.c | 934 ++++++++++++++++++++-------------------
sys/arch/atari/dev/ncr5380reg.h | 26 +-
sys/arch/atari/dev/ncr5380var.h | 42 +-
4 files changed, 728 insertions(+), 654 deletions(-)
diffs (truncated from 2797 to 300 lines):
diff -r 07d7422777fa -r a39fa98d5a24 sys/arch/atari/dev/atari5380.c
--- a/sys/arch/atari/dev/atari5380.c Tue Apr 13 13:29:35 2010 +0000
+++ b/sys/arch/atari/dev/atari5380.c Tue Apr 13 13:30:37 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: atari5380.c,v 1.54 2010/04/10 18:02:05 tsutsui Exp $ */
+/* $NetBSD: atari5380.c,v 1.55 2010/04/13 13:30:37 tsutsui Exp $ */
/*
* Copyright (c) 1995 Leo Weppelman.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.54 2010/04/10 18:02:05 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atari5380.c,v 1.55 2010/04/13 13:30:37 tsutsui Exp $");
#include "opt_atariscsi.h"
@@ -98,12 +98,13 @@
/* fails on older atari's */
#define ENABLE_NCR5380(sc) cur_softc = sc;
-static u_char *alloc_bounceb(u_long);
-static void free_bounceb(u_char *);
+static uint8_t *alloc_bounceb(u_long);
+static void free_bounceb(uint8_t *);
static int machine_match(struct device *, void *, void *,
- struct cfdriver *);
- void scsi_ctrl(int);
- void scsi_dma(int);
+ struct cfdriver *);
+
+void scsi_ctrl(int);
+void scsi_dma(int);
/*
* Functions that do nothing on the atari
@@ -121,31 +122,31 @@
#define SCSI_5380 ((struct scsi_5380 *)AD_NCR5380)
struct scsi_dma {
- volatile u_char s_dma_ptr[8]; /* use only the odd bytes */
- volatile u_char s_dma_cnt[8]; /* use only the odd bytes */
- volatile u_char s_dma_res[4]; /* data residue register */
- volatile u_char s_dma_gap; /* not used */
- volatile u_char s_dma_ctrl; /* control register */
- volatile u_char s_dma_gap2; /* not used */
- volatile u_char s_hdma_ctrl; /* Hades control register */
+ volatile uint8_t s_dma_ptr[8]; /* use only the odd bytes */
+ volatile uint8_t s_dma_cnt[8]; /* use only the odd bytes */
+ volatile uint8_t s_dma_res[4]; /* data residue register */
+ volatile uint8_t s_dma_gap; /* not used */
+ volatile uint8_t s_dma_ctrl; /* control register */
+ volatile uint8_t s_dma_gap2; /* not used */
+ volatile uint8_t s_hdma_ctrl; /* Hades control register */
};
-static inline void set_scsi_dma(volatile u_char *, u_long);
-static inline u_long get_scsi_dma(volatile u_char *);
+static inline void set_scsi_dma(volatile uint8_t *, u_long);
+static inline u_long get_scsi_dma(volatile uint8_t *);
static inline void
-set_scsi_dma(volatile u_char *addr, u_long val)
+set_scsi_dma(volatile uint8_t *addr, u_long val)
{
- volatile u_char *address;
+ volatile uint8_t *address;
address = addr + 1;
__asm("movepl %0, %1@(0)": :"d" (val), "a" (address));
}
static inline u_long
-get_scsi_dma(volatile u_char *addr)
+get_scsi_dma(volatile uint8_t *addr)
{
- volatile u_char *address;
+ volatile uint8_t *address;
u_long nval;
address = addr + 1;
@@ -174,7 +175,7 @@
* Define the 5380 register set
*/
struct scsi_5380 {
- volatile u_char scsi_5380[16]; /* use only the odd bytes */
+ volatile uint8_t scsi_5380[16]; /* use only the odd bytes */
};
#endif /* TT_SCSI */
@@ -221,15 +222,16 @@
static int tt_wrong_dma_range(SC_REQ *, struct dma_chain *);
#endif
static void scsi_tt_init(struct ncr_softc *);
-static u_char get_tt_5380_reg(u_short);
+static uint8_t get_tt_5380_reg(u_short);
static void set_tt_5380_reg(u_short, u_short);
-static void scsi_tt_dmasetup(SC_REQ *, u_int, u_char);
+static void scsi_tt_dmasetup(SC_REQ *, u_int, uint8_t);
static int tt_poll_edma(SC_REQ *);
-static u_char *ptov(SC_REQ *, u_long*);
+static uint8_t *ptov(SC_REQ *, u_long*);
static int tt_get_dma_result(SC_REQ *, u_long *);
- void scsi_tt_ienable(void);
- void scsi_tt_idisable(void);
- void scsi_tt_clr_ipend(void);
+
+void scsi_tt_ienable(void);
+void scsi_tt_idisable(void);
+void scsi_tt_clr_ipend(void);
/*
* Define these too, so we can use them locally...
@@ -241,11 +243,12 @@
static int
tt_wrong_dma_range(SC_REQ *reqp, struct dma_chain *dm)
{
+
if (dm->dm_addr & 0xff000000) {
reqp->dr_flag |= DRIVER_BOUNCING;
- return(1);
+ return 1;
}
- return(0);
+ return 0;
}
#else
#define tt_wrong_dma_range(reqp, dm) 0
@@ -254,6 +257,7 @@
static void
scsi_tt_init(struct ncr_softc *sc)
{
+
/*
* Enable SCSI-related interrupts
*/
@@ -262,21 +266,19 @@
if (machineid & ATARI_TT) {
/* SCSI-DMA interrupts */
MFP2->mf_ierb |= IB_SCDM;
- MFP2->mf_iprb = (u_int8_t)~IB_SCDM;
+ MFP2->mf_iprb = (uint8_t)~IB_SCDM;
MFP2->mf_imrb |= IB_SCDM;
- }
- else if (machineid & ATARI_HADES) {
+ } else if (machineid & ATARI_HADES) {
SCSI_DMA->s_hdma_ctrl = 0;
if (intr_establish(2, AUTO_VEC, 0,
- (hw_ifun_t)ncr5380_drq_intr,
- NULL) == NULL)
+ (hw_ifun_t)ncr5380_drq_intr, NULL) == NULL)
panic("scsi_tt_init: Can't establish drq-interrupt");
- }
- else panic("scsi_tt_init: should not come here");
+ } else
+ panic("scsi_tt_init: should not come here");
MFP2->mf_iera |= IA_SCSI; /* SCSI-5380 interrupts */
- MFP2->mf_ipra = (u_int8_t)~IA_SCSI;
+ MFP2->mf_ipra = (uint8_t)~IA_SCSI;
MFP2->mf_imra |= IA_SCSI;
/*
@@ -290,21 +292,24 @@
#endif
}
-static u_char
+static uint8_t
get_tt_5380_reg(u_short rnum)
{
- return(SCSI_5380->scsi_5380[(rnum << 1) | 1]);
+
+ return SCSI_5380->scsi_5380[(rnum << 1) | 1];
}
static void
set_tt_5380_reg(u_short rnum, u_short val)
{
+
SCSI_5380->scsi_5380[(rnum << 1) | 1] = val;
}
extern inline void
scsi_tt_ienable(void)
{
+
if (machineid & ATARI_TT)
single_inst_bset_b(MFP2->mf_imrb, IB_SCDM);
single_inst_bset_b(MFP2->mf_imra, IA_SCSI);
@@ -313,6 +318,7 @@
extern inline void
scsi_tt_idisable(void)
{
+
if (machineid & ATARI_TT)
single_inst_bclr_b(MFP2->mf_imrb, IB_SCDM);
single_inst_bclr_b(MFP2->mf_imra, IA_SCSI);
@@ -321,13 +327,13 @@
extern inline void
scsi_tt_clr_ipend(void)
{
- int tmp;
+ int tmp;
SCSI_DMA->s_dma_ctrl = 0;
tmp = GET_TT_REG(NCR5380_IRCV);
if (machineid & ATARI_TT)
- MFP2->mf_iprb = (u_int8_t)~IB_SCDM;
- MFP2->mf_ipra = (u_int8_t)~IA_SCSI;
+ MFP2->mf_iprb = (uint8_t)~IB_SCDM;
+ MFP2->mf_ipra = (uint8_t)~IA_SCSI;
/*
* Remove interrupts already scheduled.
@@ -337,23 +343,23 @@
}
static void
-scsi_tt_dmasetup(SC_REQ *reqp, u_int phase, u_char mode)
+scsi_tt_dmasetup(SC_REQ *reqp, u_int phase, uint8_t mode)
{
+
if (PH_IN(phase)) {
SCSI_DMA->s_dma_ctrl = SD_IN;
if (machineid & ATARI_HADES)
- SCSI_DMA->s_hdma_ctrl &= ~(SDH_BUSERR|SDH_EOP);
+ SCSI_DMA->s_hdma_ctrl &= ~(SDH_BUSERR|SDH_EOP);
set_scsi_dma(SCSI_DMA->s_dma_ptr, reqp->dm_cur->dm_addr);
set_scsi_dma(SCSI_DMA->s_dma_cnt, reqp->dm_cur->dm_count);
SET_TT_REG(NCR5380_ICOM, 0);
SET_TT_REG(NCR5380_MODE, mode);
SCSI_DMA->s_dma_ctrl = SD_ENABLE;
SET_TT_REG(NCR5380_IRCV, 0);
- }
- else {
+ } else {
SCSI_DMA->s_dma_ctrl = SD_OUT;
if (machineid & ATARI_HADES)
- SCSI_DMA->s_hdma_ctrl &= ~(SDH_BUSERR|SDH_EOP);
+ SCSI_DMA->s_hdma_ctrl &= ~(SDH_BUSERR|SDH_EOP);
set_scsi_dma(SCSI_DMA->s_dma_ptr, reqp->dm_cur->dm_addr);
set_scsi_dma(SCSI_DMA->s_dma_cnt, reqp->dm_cur->dm_count);
SET_TT_REG(NCR5380_MODE, mode);
@@ -366,7 +372,7 @@
static int
tt_poll_edma(SC_REQ *reqp)
{
- u_char dmstat, dmastat;
+ uint8_t dmstat, dmastat;
int timeout = 9000; /* XXX */
/*
@@ -390,7 +396,7 @@
ncr_tprint(reqp, "timeout on polled transfer\n");
reqp->xs->error = XS_TIMEOUT;
scsi_tt_ienable();
- return(0);
+ return 0;
}
dmstat = GET_TT_REG(NCR5380_DMSTAT);
@@ -402,43 +408,43 @@
dmastat = SCSI_DMA->s_dma_ctrl;
if (dmstat & (SC_END_DMA|SC_BSY_ERR|SC_IRQ_SET))
break;
- if (!(dmstat & SC_PHS_MTCH))
+ if ((dmstat & SC_PHS_MTCH) == 0)
break;
if (dmastat & (SD_BUSERR|SD_ZERO))
break;
}
scsi_tt_ienable();
- return(1);
+ return 1;
}
/*
* Convert physical DMA address to a virtual address.
*/
-static u_char *
+static uint8_t *
ptov(SC_REQ *reqp, u_long *phaddr)
{
struct dma_chain *dm;
- u_char *vaddr;
+ uint8_t *vaddr;
dm = reqp->dm_chain;
vaddr = reqp->xdata_ptr;
- for(; dm < reqp->dm_cur; dm++)
+ for (; dm < reqp->dm_cur; dm++)
vaddr += dm->dm_count;
vaddr += (u_long)phaddr - dm->dm_addr;
- return(vaddr);
+ return vaddr;
}
Home |
Main Index |
Thread Index |
Old Index