Skip to content

Commit 6db34e6

Browse files
committed
rename a variable and try to get makedev to work
1 parent b95949c commit 6db34e6

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

etc/etc.evbppc/MAKEDEV.conf

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,14 @@ all_md)
2626
makedev virtio
2727
;;
2828

29-
# TODO - i think i can add something here to create my device files
30-
# instead of manually calling mknod i just dont know yet..
3129
# ramdisk definition is found at distrib/evbppc/ramdisk/Makefile
3230

3331
xlcom[0-9]*)
3432
unit=${i#xlcom}
3533
mkdev xlcom$unit c 99 $unit "" "" $u_uucp
3634
;;
35+
36+
gcport[0-3]*)
37+
unit=${i#gcport}
38+
mkdev gcport$unit c 100 $unit "" "" $u_uucp
39+
;;

sys/arch/evbppc/nintendo/dev/gcport_si.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -192,38 +192,38 @@ gcport_ioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
192192
}
193193

194194
static int
195-
siioctl_send(struct si_channel *ch, struct si_payload *gbs)
195+
siioctl_send(struct si_channel *ch, struct si_payload *p)
196196
{
197197
int err;
198198
struct si_softc *sc;
199199
struct siio_send sd;
200200

201201
err = 0;
202202
sc = ch->ch_sc;
203-
if (gbs->outsize > SIIOBUF_SIZE || gbs->insize > SIIOBUF_SIZE) {
203+
if (p->outsize > SIIOBUF_SIZE || p->insize > SIIOBUF_SIZE) {
204204
return EINVAL;
205205
}
206206

207207
sd.chan = ch->ch_index;
208-
sd.outsize = gbs->outsize;
209-
sd.insize = gbs->insize;
210-
sd.out = kmem_alloc(gbs->outsize, KM_SLEEP);
211-
sd.in = kmem_alloc(gbs->insize, KM_SLEEP);
212-
sd.delay = gbs->delay;
208+
sd.outsize = p->outsize;
209+
sd.insize = p->insize;
210+
sd.out = kmem_alloc(p->outsize, KM_SLEEP);
211+
sd.in = kmem_alloc(p->insize, KM_SLEEP);
212+
sd.delay = p->delay;
213213

214-
if ((err = copyin(gbs->out, sd.out, sd.outsize)) != 0) {
214+
if ((err = copyin(p->out, sd.out, sd.outsize)) != 0) {
215215
goto si_send_cleanup;
216216
}
217217

218218
if ((err = __si_send(sc, &sd)) != 0) {
219219
goto si_send_cleanup;
220220
}
221221

222-
if ((err = copyout(sd.in, gbs->in, sd.insize)) != 0) {
222+
if ((err = copyout(sd.in, p->in, sd.insize)) != 0) {
223223
goto si_send_cleanup;
224224
}
225225

226-
if ((err = copyout(&sd.status, gbs->status, sizeof(uint32_t))) != 0) {
226+
if ((err = copyout(&sd.status, p->status, sizeof(uint32_t))) != 0) {
227227
goto si_send_cleanup;
228228
}
229229
si_send_cleanup:

0 commit comments

Comments
 (0)