]>
Commit | Line | Data |
---|---|---|
fa96d404 JB |
1 | --- glide3x-20010309/swlibs/newpci/pcilib/fxlinux.c.orig 2004-01-17 17:59:39.000000000 +0100 |
2 | +++ glide3x-20010309/swlibs/newpci/pcilib/fxlinux.c 2004-01-17 18:09:29.907700856 +0100 | |
3 | @@ -129,7 +129,7 @@ | |
4 | default: | |
5 | return 0; | |
6 | } | |
7 | - if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1) | |
6044ccc7 | 8 | + if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1) |
fa96d404 JB |
9 | return 0; |
10 | switch (size) { | |
11 | case 1: | |
12 | @@ -153,7 +153,7 @@ | |
13 | desc.size=size; | |
14 | desc.device=device; | |
15 | desc.value=&data; | |
16 | - if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1) | |
6044ccc7 | 17 | + if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1) |
fa96d404 JB |
18 | return FXFALSE; |
19 | return FXTRUE; | |
20 | } | |
21 | @@ -253,7 +253,7 @@ | |
22 | desc.size=sizeof(tmp); | |
23 | desc.value=&tmp; | |
24 | /* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */ | |
25 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
6044ccc7 | 26 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); |
fa96d404 JB |
27 | /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */ |
28 | return tmp; | |
29 | } | |
30 | @@ -273,7 +273,7 @@ | |
31 | desc.size=sizeof(tmp); | |
32 | desc.value=&tmp; | |
33 | /* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */ | |
34 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
6044ccc7 | 35 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); |
fa96d404 JB |
36 | /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */ |
37 | return tmp; | |
38 | } | |
39 | @@ -293,7 +293,7 @@ | |
40 | desc.size=sizeof(tmp); | |
41 | desc.value=&tmp; | |
42 | /* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */ | |
43 | - ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc); | |
6044ccc7 | 44 | + ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc); |
fa96d404 JB |
45 | /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */ |
46 | return tmp; | |
47 | } | |
48 | @@ -311,7 +311,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; | |
d9da050b | 53 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; |
fa96d404 JB |
54 | } |
55 | ||
56 | static FxBool | |
57 | @@ -327,7 +327,7 @@ | |
58 | desc.port=port; | |
59 | desc.size=sizeof(data); | |
60 | desc.value=&data; | |
61 | - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; | |
d9da050b | 62 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; |
fa96d404 JB |
63 | } |
64 | ||
65 | static FxBool | |
66 | @@ -343,7 +343,7 @@ | |
67 | desc.port=port; | |
68 | desc.size=sizeof(data); | |
69 | desc.value=&data; | |
70 | - return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1; | |
d9da050b | 71 | + return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1; |
fa96d404 JB |
72 | } |
73 | ||
74 | static FxBool |