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

sheduler->scheduler, as pointed out by Klaus Klein

This commit is contained in:
bouyer 2000-06-13 13:59:15 +00:00
parent 3553879fc2
commit 22a10be43e
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/ic/siop.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: siop.c,v 1.20 2000/06/12 20:13:41 bouyer Exp $ */
/* $NetBSD: siop.c,v 1.21 2000/06/13 13:59:17 bouyer Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@ -144,7 +144,7 @@ siop_attach(sc)
int rseg;
/*
* Allocate DMA-safe memory for the script and script sheduler
* Allocate DMA-safe memory for the script and script scheduler
* and map it.
*/
if ((sc->features & SF_CHIP_RAM) == 0) {
@ -182,37 +182,37 @@ siop_attach(sc)
error = bus_dmamem_alloc(sc->sc_dmat, NBPG,
NBPG, 0, &seg, 1, &rseg, BUS_DMA_NOWAIT);
if (error) {
printf("%s: unable to allocate sheduler DMA memory, "
printf("%s: unable to allocate scheduler DMA memory, "
"error = %d\n", sc->sc_dev.dv_xname, error);
return;
}
error = bus_dmamem_map(sc->sc_dmat, &seg, rseg, NBPG,
(caddr_t *)&sc->sc_shed, BUS_DMA_NOWAIT|BUS_DMA_COHERENT);
if (error) {
printf("%s: unable to map sheduler DMA memory, error = %d\n",
printf("%s: unable to map scheduler DMA memory, error = %d\n",
sc->sc_dev.dv_xname, error);
return;
}
error = bus_dmamap_create(sc->sc_dmat, NBPG, 1,
NBPG, 0, BUS_DMA_NOWAIT, &sc->sc_sheddma);
if (error) {
printf("%s: unable to create sheduler DMA map, error = %d\n",
printf("%s: unable to create scheduler DMA map, error = %d\n",
sc->sc_dev.dv_xname, error);
return;
}
error = bus_dmamap_load(sc->sc_dmat, sc->sc_sheddma, sc->sc_shed,
NBPG, NULL, BUS_DMA_NOWAIT);
if (error) {
printf("%s: unable to load sheduler DMA map, error = %d\n",
printf("%s: unable to load scheduler DMA map, error = %d\n",
sc->sc_dev.dv_xname, error);
return;
}
TAILQ_INIT(&sc->free_list);
TAILQ_INIT(&sc->cmds);
/* compute number of sheduler slots */
/* compute number of scheduler slots */
sc->sc_nshedslots = (
NBPG /* memory size allocated for sheduler */
- sizeof(endslot_script) /* memory needed at end of sheduler */
NBPG /* memory size allocated for scheduler */
- sizeof(endslot_script) /* memory needed at end of scheduler */
) / (sizeof(slot_script) - 8);
sc->sc_currshedslot = 0;
#ifdef DEBUG
@ -297,7 +297,7 @@ siop_reset(sc)
htole32(sc->sc_sheddma->dm_segs[0].ds_addr);
}
}
/* copy and init the sheduler slots script */
/* copy and init the scheduler slots script */
for (i = 0; i < sc->sc_nshedslots; i++) {
scr = &sc->sc_shed[(Ent_nextslot / 4) * i];
physaddr = sc->sc_sheddma->dm_segs[0].ds_addr +
@ -1307,7 +1307,7 @@ siop_start(sc)
if (siop_cmd->status != CMDST_READY &&
siop_cmd->status != CMDST_SENSE)
continue;
/* find a free sheduler slot and load it */
/* find a free scheduler slot and load it */
for (; slot < sc->sc_nshedslots; slot++) {
scr = &sc->sc_shed[(Ent_nextslot / 4) * slot];
/*

10
sys/dev/ic/siopvar.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: siopvar.h,v 1.7 2000/05/25 10:10:56 bouyer Exp $ */
/* $NetBSD: siopvar.h,v 1.8 2000/06/13 13:59:17 bouyer Exp $ */
/*
* Copyright (c) 2000 Manuel Bouyer.
@ -55,11 +55,11 @@ struct siop_softc {
bus_dma_tag_t sc_dmat; /* bus DMA tag */
void (*sc_reset) __P((struct siop_softc*)); /* reset callback */
bus_dmamap_t sc_scriptdma; /* DMA map for script */
bus_dmamap_t sc_sheddma; /* DMA map for sheduler script */
bus_dmamap_t sc_sheddma; /* DMA map for scheduler script */
u_int32_t *sc_script; /* script location in memory */
u_int32_t *sc_shed; /* script sheduler location in memory */
int sc_nshedslots; /* number of sheduler slots */
int sc_currshedslot; /* current sheduler slot */
u_int32_t *sc_shed; /* script scheduler location in mem */
int sc_nshedslots; /* number of scheduler slots */
int sc_currshedslot; /* current scheduler slot */
struct cbd_list cmds; /* list of command block descriptors */
struct cmd_list free_list; /* cmd descr free list */
struct siop_target *targets[16]; /* per-target states */

6
sys/dev/microcode/siop/siop.ss
View File

@ -1,4 +1,4 @@
; $NetBSD: siop.ss,v 1.6 2000/05/25 10:10:54 bouyer Exp $
; $NetBSD: siop.ss,v 1.7 2000/06/13 13:59:15 bouyer Exp $
;
; Copyright (c) 2000 Manuel Bouyer.
@ -232,11 +232,11 @@ get_extmsgdata:
MOVE FROM t_ext_msg_data, WHEN MSG_IN;
INT int_extmsgdata;
; script used for the sheduler: when a slot is free the JUMP points to
; script used for the scheduler: when a slot is free the JUMP points to
; the next slot so that instructions for this slot are not run.
; once the CPU has set up the slot variables (DSA address) it changes
; the JUMP address to 0 (so that it'll jump to the next instruction) and
; this command will be processed next time the sheduler is executed.
; this command will be processed next time the scheduler is executed.
; When the target has been successfully selected the script changes the jump
; addr back to the next slot, so that it's ignored the next time.
;