--- glide3x-20010309/swlibs/newpci/pcilib/fxlinux.c.orig 2004-01-17 17:59:39.000000000 +0100 +++ glide3x-20010309/swlibs/newpci/pcilib/fxlinux.c 2004-01-17 18:09:29.907700856 +0100 @@ -129,7 +129,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: @@ -153,7 +153,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; } @@ -253,7 +253,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; } @@ -273,7 +273,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; } @@ -293,7 +293,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; } @@ -311,7 +311,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; } static FxBool @@ -327,7 +327,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; } static FxBool @@ -343,7 +343,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; } static FxBool