]>
Commit | Line | Data |
---|---|---|
4988e880 JB |
1 | --- Glide_VG-2.46/swlibs/fxpci/pcilib/fxlinux.c.orig 2004-01-18 11:51:03.000000000 +0100 |
2 | +++ Glide_VG-2.46/swlibs/fxpci/pcilib/fxlinux.c 2004-01-18 11:55:19.323911880 +0100 | |
3 | @@ -130,7 +130,7 @@ | |
4 | desc.size=sizeof(tmp); | |
5 | desc.value=&tmp; | |
6 | /* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */ | |
7 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
8 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); | |
9 | /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */ | |
10 | return tmp; | |
11 | } | |
12 | @@ -148,7 +148,7 @@ | |
13 | desc.size=sizeof(tmp); | |
14 | desc.value=&tmp; | |
15 | /* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */ | |
16 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
17 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); | |
18 | /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */ | |
19 | return tmp; | |
20 | } | |
21 | @@ -166,7 +166,7 @@ | |
22 | desc.size=sizeof(tmp); | |
23 | desc.value=&tmp; | |
24 | /* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */ | |
25 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
26 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); | |
27 | /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */ | |
28 | return tmp; | |
29 | } | |
30 | @@ -182,7 +182,7 @@ | |
31 | desc.port=port; | |
32 | desc.size=sizeof(data); | |
33 | desc.value=&data; | |
34 | - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; | |
35 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; | |
36 | } | |
37 | ||
38 | FxBool pioOutWord(unsigned short port, FxU16 data) { | |
39 | @@ -196,7 +196,7 @@ | |
40 | desc.port=port; | |
41 | desc.size=sizeof(data); | |
42 | desc.value=&data; | |
43 | - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; | |
44 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; | |
45 | } | |
46 | ||
47 | FxBool pioOutLong(unsigned short port, FxU32 data) { | |
48 | @@ -210,7 +210,7 @@ | |
49 | desc.port=port; | |
50 | desc.size=sizeof(data); | |
51 | desc.value=&data; | |
52 | - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; | |
53 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; | |
54 | } | |
55 | ||
56 | FxBool hasDev3DfxLinux(void) { | |
57 | @@ -247,7 +247,7 @@ | |
58 | default: | |
59 | return 0; | |
60 | } | |
61 | - if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1) | |
62 | + if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1) | |
63 | return 0; | |
64 | switch (size) { | |
65 | case 1: | |
66 | @@ -270,7 +270,7 @@ | |
67 | desc.size=size; | |
68 | desc.device=device; | |
69 | desc.value=&data; | |
70 | - if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1) | |
71 | + if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1) | |
72 | return FXFALSE; | |
73 | return FXTRUE; | |
74 | } |