org.handhelds.familiar/packages/orinoco/orinoco-modules-0.15rc1/add_event.patch

   1 Index: orinoco-0.15rc2/orinoco_cs.c
   2 ===================================================================
   3 --- orinoco-0.15rc2.orig/orinoco_cs.c   2004-07-28 07:06:45.000000000 +0100
   4 +++ orinoco-0.15rc2/orinoco_cs.c        2005-08-03 18:38:34.000000000 +0100
   5 @@ -189,11 +189,13 @@
   6
   7         client_reg.dev_info = &dev_info;
   8         client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
   9 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13))
  10         client_reg.EventMask =
  11                 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
  12                 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
  13                 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
  14         client_reg.event_handler = &orinoco_cs_event;
  15 +#endif
  16         client_reg.Version = 0x0210; /* FIXME: what does this mean? */
  17         client_reg.event_callback_args.client_data = link;
  18
  19 @@ -612,6 +614,9 @@
  20                 .name   = DRIVER_NAME,
  21         },
  22         .attach         = orinoco_cs_attach,
  23 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
  24 +       .event          = orinoco_cs_event,
  25 +#endif
  26         .detach         = orinoco_cs_detach,
  27  };
  28
  29 Index: orinoco-0.15rc2/spectrum_cs.c
  30 ===================================================================
  31 --- orinoco-0.15rc2.orig/spectrum_cs.c  2005-08-03 11:51:09.000000000 +0100
  32 +++ orinoco-0.15rc2/spectrum_cs.c       2005-08-03 18:38:46.000000000 +0100
  33 @@ -699,11 +699,13 @@
  34
  35         client_reg.dev_info = &dev_info;
  36         client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
  37 +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,13))
  38         client_reg.EventMask =
  39                 CS_EVENT_CARD_INSERTION | CS_EVENT_CARD_REMOVAL |
  40                 CS_EVENT_RESET_PHYSICAL | CS_EVENT_CARD_RESET |
  41                 CS_EVENT_PM_SUSPEND | CS_EVENT_PM_RESUME;
  42         client_reg.event_handler = &spectrum_cs_event;
  43 +#endif
  44         client_reg.Version = 0x0210; /* FIXME: what does this mean? */
  45         client_reg.event_callback_args.client_data = link;
  46
  47 @@ -1096,6 +1098,9 @@
  48                 .name   = DRIVER_NAME,
  49         },
  50         .attach         = spectrum_cs_attach,
  51 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
  52 +       .event          = spectrum_cs_event,
  53 +#endif
  54         .detach         = spectrum_cs_detach,
  55  };
  56