mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

62 lines
2.1 KiB

  1. Benjamin Schieder:
  2. hotfix for PCMCIA Cardreadears
  3. see http://www.nabble.com/Bug-399682%3A-openct%3A-cm4000-driver-fails-with-%22cm4000%3A-setting-parameters-failed%22-tf2678176.html#a7488217
  4. diff -pruN openct-0.6.11/src/ifd/pcmcia-block.c openct-0.6.11-patched/src/ifd/pcmcia-block.c
  5. --- openct-0.6.11/src/ifd/pcmcia-block.c 2006-06-16 19:38:16.000000000 +0200
  6. +++ openct-0.6.11-patched/src/ifd/pcmcia-block.c 2007-01-07 12:31:38.000000000 +0100
  7. @@ -81,6 +81,17 @@ ifd_pcmcia_block_recv(ifd_device_t * dev
  8. }
  9. /*
  10. + * Set pcmcia params
  11. + */
  12. +static int ifd_pcmcia_block_set_params(ifd_device_t * dev,
  13. + const ifd_device_params_t * params)
  14. +{
  15. + /* nothing to do so far */
  16. + dev->settings = *params;
  17. + return 0;
  18. +}
  19. +
  20. +/*
  21. * Close the device
  22. */
  23. static void ifd_pcmcia_block_close(ifd_device_t * dev)
  24. @@ -107,6 +118,7 @@ ifd_device_t *ifd_open_pcmcia_block(cons
  25. ifd_pcmcia_block_ops.send = ifd_pcmcia_block_send;
  26. ifd_pcmcia_block_ops.recv = ifd_pcmcia_block_recv;
  27. + ifd_pcmcia_block_ops.set_params = ifd_pcmcia_block_set_params;
  28. ifd_pcmcia_block_ops.close = ifd_pcmcia_block_close;
  29. dev = ifd_device_new(name, &ifd_pcmcia_block_ops, sizeof(*dev));
  30. diff -pruN openct-0.6.11/src/ifd/pcmcia.c openct-0.6.11-patched/src/ifd/pcmcia.c
  31. --- openct-0.6.11/src/ifd/pcmcia.c 2006-06-16 19:38:16.000000000 +0200
  32. +++ openct-0.6.11-patched/src/ifd/pcmcia.c 2007-01-07 12:32:08.000000000 +0100
  33. @@ -89,6 +89,17 @@ static int ifd_pcmcia_recv(ifd_device_t
  34. }
  35. /*
  36. + * Set pcmcia params
  37. + */
  38. +static int ifd_pcmcia_set_params(ifd_device_t * dev,
  39. + const ifd_device_params_t * params)
  40. +{
  41. + /* nothing to do so far */
  42. + dev->settings = *params;
  43. + return 0;
  44. +}
  45. +
  46. +/*
  47. * Close the device
  48. */
  49. static void ifd_pcmcia_close(ifd_device_t * dev)
  50. @@ -115,6 +126,7 @@ ifd_device_t *ifd_open_pcmcia(const char
  51. ifd_pcmcia_ops.send = ifd_pcmcia_send;
  52. ifd_pcmcia_ops.recv = ifd_pcmcia_recv;
  53. + ifd_pcmcia_ops.set_params = ifd_pcmcia_set_params;
  54. ifd_pcmcia_ops.close = ifd_pcmcia_close;
  55. dev = ifd_device_new(name, &ifd_pcmcia_ops, sizeof(*dev));