--- Glide_VG-2.46/swlibs/fxpci/pcilib/fxlinux.c.orig 2004-01-18 11:51:03.000000000 +0100 +++ Glide_VG-2.46/swlibs/fxpci/pcilib/fxlinux.c 2004-01-18 11:55:19.323911880 +0100 @@ -130,7 +130,7 @@ desc.size=sizeof(tmp); desc.value=&tmp; /* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */ - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */ return tmp; } @@ -148,7 +148,7 @@ desc.size=sizeof(tmp); desc.value=&tmp; /* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */ - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */ return tmp; } @@ -166,7 +166,7 @@ desc.size=sizeof(tmp); desc.value=&tmp; /* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */ - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */ return tmp; } @@ -182,7 +182,7 @@ desc.port=port; desc.size=sizeof(data); desc.value=&data; - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; } FxBool pioOutWord(unsigned short port, FxU16 data) { @@ -196,7 +196,7 @@ desc.port=port; desc.size=sizeof(data); desc.value=&data; - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; } FxBool pioOutLong(unsigned short port, FxU32 data) { @@ -210,7 +210,7 @@ desc.port=port; desc.size=sizeof(data); desc.value=&data; - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; } FxBool hasDev3DfxLinux(void) { @@ -247,7 +247,7 @@ default: return 0; } - if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1) + if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1) return 0; switch (size) { case 1: @@ -270,7 +270,7 @@ desc.size=size; desc.device=device; desc.value=&data; - if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1) + if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1) return FXFALSE; return FXTRUE; }