Attachment #34054 for bug #54999

View | Details | Raw Unified | Return to bug 54999
Collapse All | Expand All




  default:
    return 0;
  }
  if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1)
    return 0;
  switch (size) {
  case 1:

  desc.size=size;
  desc.device=device;
  desc.value=&data;
  if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1)
    return FXFALSE;
  return FXTRUE;
}

  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, struct pioData), &desc);
  /* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */
  return tmp;
}

  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, struct pioData), &desc);
  /* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */
  return tmp;
}

  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, struct pioData), &desc);
  /* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */
  return tmp;
}

  desc.port=port;
  desc.size=sizeof(data);
  desc.value=&data;
  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
}

static FxBool 

  desc.port=port;
  desc.size=sizeof(data);
  desc.value=&data;
  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
}

static FxBool 

  desc.port=port;
  desc.size=sizeof(data);
  desc.value=&data;
  return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
}

static FxBool

Return to bug 54999

Lines 129-135 Link Here

(-)swlibs/newpci/pcilib/fxlinux.c.orig (-8 / +8 lines)
129	default:	129	default:
130	return 0;	130	return 0;
131	}	131	}
132	if (ioctl(linuxDevFd, _IOR('3', 3, sizeof(struct pioData)), &desc)==-1)	132	if (ioctl(linuxDevFd, _IOR('3', 3, struct pioData), &desc)==-1)
133	return 0;	133	return 0;
134	switch (size) {	134	switch (size) {
135	case 1:	135	case 1:
Lines 153-159 Link Here
153	desc.size=size;	153	desc.size=size;
154	desc.device=device;	154	desc.device=device;
155	desc.value=&data;	155	desc.value=&data;
156	if (ioctl(linuxDevFd, _IOW('3', 4, sizeof(struct pioData)), &desc)==-1)	156	if (ioctl(linuxDevFd, _IOW('3', 4, struct pioData), &desc)==-1)
157	return FXFALSE;	157	return FXFALSE;
158	return FXTRUE;	158	return FXTRUE;
159	}	159	}
Lines 253-259 Link Here
253	desc.size=sizeof(tmp);	253	desc.size=sizeof(tmp);
254	desc.value=&tmp;	254	desc.value=&tmp;
255	/* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */	255	/* fprintf(stderr, "Read byte desc at %x tmp at %x\n", &desc, &tmp); */
256	ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);	256	ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
257	/* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */	257	/* fprintf(stderr, "Got byte %d versus %d\n", tmp, inb(port)); */
258	return tmp;	258	return tmp;
259	}	259	}
Lines 273-279 Link Here
273	desc.size=sizeof(tmp);	273	desc.size=sizeof(tmp);
274	desc.value=&tmp;	274	desc.value=&tmp;
275	/* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */	275	/* fprintf(stderr, "Read word desc at %x tmp at %x\n", &desc, &tmp); */
276	ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);	276	ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
277	/* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */	277	/* fprintf(stderr, "Got word %d versus %d\n", tmp, inw(port)); */
278	return tmp;	278	return tmp;
279	}	279	}
Lines 293-299 Link Here
293	desc.size=sizeof(tmp);	293	desc.size=sizeof(tmp);
294	desc.value=&tmp;	294	desc.value=&tmp;
295	/* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */	295	/* fprintf(stderr, "Read long desc at %x tmp at %x\n", &desc, &tmp); */
296	ioctl(linuxDevFd, _IOR(0, 0, sizeof(struct pioData)), &desc);	296	ioctl(linuxDevFd, _IOR(0, 0, struct pioData), &desc);
297	/* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */	297	/* fprintf(stderr, "Got long %x versus %x\n", tmp, inl(port)); */
298	return tmp;	298	return tmp;
299	}	299	}
Lines 311-317 Link Here
311	desc.port=port;	311	desc.port=port;
312	desc.size=sizeof(data);	312	desc.size=sizeof(data);
313	desc.value=&data;	313	desc.value=&data;
314	return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;	314	return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
315	}	315	}
316		316
317	static FxBool	317	static FxBool
Lines 327-333 Link Here
327	desc.port=port;	327	desc.port=port;
328	desc.size=sizeof(data);	328	desc.size=sizeof(data);
329	desc.value=&data;	329	desc.value=&data;
330	return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;	330	return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
331	}	331	}
332		332
333	static FxBool	333	static FxBool
Lines 343-349 Link Here
343	desc.port=port;	343	desc.port=port;
344	desc.size=sizeof(data);	344	desc.size=sizeof(data);
345	desc.value=&data;	345	desc.value=&data;
346	return ioctl(linuxDevFd, _IOW(0, 1, sizeof(struct pioData)), &desc)!=-1;	346	return ioctl(linuxDevFd, _IOW(0, 1, struct pioData), &desc)!=-1;
347	}	347	}
348		348
349	static FxBool	349	static FxBool