Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We no longer need to get the register sets by ourselves.

This commit is contained in:
pk 1998-07-29 18:36:08 +00:00
parent 4f2fd378bb
commit 426330f642
3 changed files with 28 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sys/arch/sparc/dev/cgfourteen.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgfourteen.c,v 1.12 1998/04/07 20:18:18 pk Exp $ */
/* $NetBSD: cgfourteen.c,v 1.13 1998/07/29 18:36:08 pk Exp $ */
/*
* Copyright (c) 1996
@ -174,11 +174,9 @@ cgfourteenattach(parent, self, aux)
struct cgfourteen_softc *sc = (struct cgfourteen_softc *)self;
struct fbdevice *fb = &sc->sc_fb;
bus_space_handle_t bh;
int nreg;
int node, ramsize;
u_int32_t *lut;
int i, isconsole;
void *p;
node = sa->sa_node;
@ -206,15 +204,13 @@ cgfourteenattach(parent, self, aux)
fb->fb_type.fb_cmsize = CG14_CLUT_SIZE;
fb->fb_type.fb_size = ramsize;
p = sc->sc_physadr;
if (getpropA(node, "reg", sizeof(struct rom_reg), &nreg, &p) != 0) {
printf("%s: cannot get register property\n", self->dv_xname);
return;
}
if (nreg < 2) {
printf("%s: only %d register sets\n", self->dv_xname, nreg);
if (sa->sa_nreg < 2) {
printf("%s: only %d register sets\n",
self->dv_xname, sa->sa_nreg);
return;
}
bcopy(sa->sa_reg, sc->sc_physadr,
sa->sa_nreg * sizeof(struct sbus_reg));
/*
* Now map in the 8 useful pages of registers
@ -570,8 +566,8 @@ cgfourteenmmap(dev, off, prot)
if ((u_int)off >= 0x10000000 && (u_int)off < 0x10000000 + 16*4096) {
off -= 0x10000000;
if (bus_space_mmap(sc->sc_bustag,
sc->sc_physadr[CG14_CTL_IDX].rr_iospace,
sc->sc_physadr[CG14_CTL_IDX].rr_paddr + off,
sc->sc_physadr[CG14_CTL_IDX].sbr_slot,
sc->sc_physadr[CG14_CTL_IDX].sbr_offset+off,
BUS_SPACE_MAP_LINEAR, &bh))
return (-1);
@ -603,8 +599,8 @@ cgfourteenmmap(dev, off, prot)
}
if (bus_space_mmap(sc->sc_bustag,
sc->sc_physadr[CG14_PXL_IDX].rr_iospace,
sc->sc_physadr[CG14_PXL_IDX].rr_paddr + off,
sc->sc_physadr[CG14_PXL_IDX].sbr_slot,
sc->sc_physadr[CG14_PXL_IDX].sbr_offset + off,
BUS_SPACE_MAP_LINEAR, &bh))
return (-1);

4
sys/arch/sparc/dev/cgfourteenvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cgfourteenvar.h,v 1.2 1998/03/21 20:11:31 pk Exp $ */
/* $NetBSD: cgfourteenvar.h,v 1.3 1998/07/29 18:36:08 pk Exp $ */
/*
* Copyright (c) 1996
@ -69,7 +69,7 @@ struct cgfourteen_softc {
struct device sc_dev; /* base device */
struct fbdevice sc_fb; /* frame buffer device */
bus_space_tag_t sc_bustag;
struct rom_reg sc_physadr[2]; /* phys addrs of h/w */
struct sbus_reg sc_physadr[2]; /* phys addrs of h/w */
#define CG14_CTL_IDX 0
#define CG14_PXL_IDX 1

43
sys/arch/sparc/dev/tcx.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: tcx.c,v 1.12 1998/04/07 20:18:18 pk Exp $ */
/* $NetBSD: tcx.c,v 1.13 1998/07/29 18:36:09 pk Exp $ */
/*
* Copyright (c) 1996,1998 The NetBSD Foundation, Inc.
@ -79,7 +79,7 @@ struct tcx_softc {
struct sbusdev sc_sd; /* sbus device */
struct fbdevice sc_fb; /* frame buffer device */
bus_space_tag_t sc_bustag;
struct rom_reg sc_physadr[TCX_NREG]; /* phys addr of h/w */
struct sbus_reg sc_physadr[TCX_NREG]; /* phys addr of h/w */
volatile struct bt_regs *sc_bt; /* Brooktree registers */
volatile struct tcx_thc *sc_thc;/* THC registers */
@ -140,9 +140,7 @@ tcxattach(parent, self, args)
volatile struct bt_regs *bt;
struct fbdevice *fb = &sc->sc_fb;
bus_space_handle_t bh;
int nreg;
int isconsole;
void *p;
extern struct tty *fbconstty;
sc->sc_bustag = sa->sa_bustag;
@ -175,25 +173,22 @@ tcxattach(parent, self, args)
fb->fb_type.fb_type = FBTYPE_RESERVED3;
/* Get device registers */
p = sc->sc_physadr;
if (getpropA(node, "reg", sizeof(struct rom_reg), &nreg, &p) != 0) {
printf("%s: cannot get register property\n", self->dv_xname);
return;
}
if (nreg != TCX_NREG) {
printf("%s: only %d register sets\n", self->dv_xname, nreg);
if (sa->sa_nreg != TCX_NREG) {
printf("%s: only %d register sets\n",
self->dv_xname, sa->sa_nreg);
return;
}
bcopy(sa->sa_reg, sc->sc_physadr,
sa->sa_nreg * sizeof(struct sbus_reg));
/* XXX - fix THC and TEC offsets */
sc->sc_physadr[TCX_REG_TEC].rr_paddr += 0x1000;
sc->sc_physadr[TCX_REG_THC].rr_paddr += 0x1000;
sc->sc_physadr[TCX_REG_TEC].sbr_offset += 0x1000;
sc->sc_physadr[TCX_REG_THC].sbr_offset += 0x1000;
/* Map the register banks we care about */
if (sbus_bus_map(sa->sa_bustag,
(bus_type_t)sc->sc_physadr[TCX_REG_THC].rr_iospace,
(bus_addr_t)sc->sc_physadr[TCX_REG_THC].rr_paddr,
(bus_type_t)sc->sc_physadr[TCX_REG_THC].sbr_slot,
(bus_addr_t)sc->sc_physadr[TCX_REG_THC].sbr_offset,
sizeof (struct tcx_thc),
BUS_SPACE_MAP_LINEAR,
0, &bh) != 0) {
@ -203,8 +198,8 @@ tcxattach(parent, self, args)
sc->sc_thc = (volatile struct tcx_thc *)bh;
if (sbus_bus_map(sa->sa_bustag,
(bus_type_t)sc->sc_physadr[TCX_REG_CMAP].rr_iospace,
(bus_addr_t)sc->sc_physadr[TCX_REG_CMAP].rr_paddr,
(bus_type_t)sc->sc_physadr[TCX_REG_CMAP].sbr_slot,
(bus_addr_t)sc->sc_physadr[TCX_REG_CMAP].sbr_offset,
sizeof (struct bt_regs),
BUS_SPACE_MAP_LINEAR,
0, &bh) != 0) {
@ -444,7 +439,7 @@ tcxmmap(dev, off, prot)
{
struct tcx_softc *sc = tcx_cd.cd_devs[minor(dev)];
bus_space_handle_t bh;
struct rom_reg *rr = sc->sc_physadr;
struct sbus_reg *rr = sc->sc_physadr;
struct mmo *mo;
u_int u, sz;
static struct mmo mmo[] = {
@ -482,8 +477,8 @@ tcxmmap(dev, off, prot)
u = off - mo->mo_uaddr;
sz = mo->mo_size ? mo->mo_size : sc->sc_fb.fb_type.fb_size;
if (u < sz) {
bus_type_t t = (bus_type_t)rr[mo->mo_bank].rr_iospace;
bus_addr_t a = (bus_addr_t)rr[mo->mo_bank].rr_paddr;
bus_type_t t = (bus_type_t)rr[mo->mo_bank].sbr_slot;
bus_addr_t a = (bus_addr_t)rr[mo->mo_bank].sbr_offset;
if (bus_space_mmap(sc->sc_bustag,
t,
@ -494,11 +489,5 @@ tcxmmap(dev, off, prot)
return ((int)bh);
}
}
#ifdef DEBUG
{
struct proc *p = curproc; /* XXX */
log(LOG_NOTICE, "tcxmmap(0x%x) (%s[%d])\n", off, p->p_comm, p->p_pid);
}
#endif
return (-1); /* not a user-map offset */
}