From 253d524b348018470c53c8f8382f6d367daede24 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 26 Jul 2006 23:04:47 +0000 Subject: 2006-07-27 Stefan Siegl * linux/pcmcia-cs/clients/xirc2ps_cs.c (busy_loop): Replace the code by a call to __udelay. * linux/pcmcia-cs/include/linux/init.h: Adapt to our Linux environment. * linux/pcmcia-cs/include/linux/slab.h: Use `#include', not `#include_next'. * linux/pcmcia-cs/include/pcmcia/mem_op.h: Adapt to our Linux environment and fix GCC 4.0 complaints. * linux/pcmcia-cs/include/pcmcia/version.h: Always assume that CONFIG_PCMCIA is not defined. * linux/pcmcia-cs/modules/cs.c (init_pcmcia_cs): Don't make it static. * linux/pcmcia-cs/modules/ds.c: Use some magic to avoid duplicate definition `io_req_t'. (ds_open, ds_release, ds_read, ds_write, ds_select, ds_poll, ds_fops): Hide functions if MACH is defined. Likewise for the module handling code. (ds_ioctl): Use plain `memcpy' if MACH is defined. (init_pcmcia_ds): Don't register charcater devices if MACH is defined. Include "../glue/ds.c". * linux/pcmcia-cs/modules/i82365.c (test_irq): Adapt to GNU Mach. (init_i82365): Don't make it static. * linux/pcmcia-cs/modules/pci_fixup.c (pci_devices): Don't define if MACH is defined. * linux/pcmcia-cs/wireless/orinoco.c: Adapt to our Linux environment. --- linux/pcmcia-cs/clients/xirc2ps_cs.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'linux/pcmcia-cs/clients') diff --git a/linux/pcmcia-cs/clients/xirc2ps_cs.c b/linux/pcmcia-cs/clients/xirc2ps_cs.c index 0cf41d3..9db947d 100644 --- a/linux/pcmcia-cs/clients/xirc2ps_cs.c +++ b/linux/pcmcia-cs/clients/xirc2ps_cs.c @@ -442,6 +442,10 @@ get_tuple(int fn, client_handle_t handle, tuple_t *tuple, cisparse_t *parse) static void busy_loop(u_long len) { +#ifdef MACH + /* TODO: Is this really what we want? */ + __udelay(1000000 / HZ * len); +#else if (in_interrupt()) { u_long timeout = jiffies + len; u_long flags; @@ -454,6 +458,7 @@ busy_loop(u_long len) __set_current_state(TASK_UNINTERRUPTIBLE); schedule_timeout(len); } +#endif } -- cgit v1.2.3