Changeset 234

Timestamp:

Aug 6, 2007, 3:06:53 AM (18 years ago)

Author:

Brendan Oakley

Message:

Merged previously missed headers to 0.9.2

Location:

GPL/branches/alsa-resync1/alsa-kernel/include/sound

Files:

• adriver.h (modified) (3 diffs)
• compat_22.h (modified) (7 diffs)
• isapnp.h (modified) (1 diff)

GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

@@ -101 +101 @@
 #ifndef mk_kdev
 #define mk_kdev(maj, min) MKDEV(maj, min)
+#endif
+#ifndef DECLARE_BITMAP
+#define DECLARE_BITMAP(name,bits) \
+        unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
 #endif
 
@@ -135 +139 @@
 #define isapnp_card pci_bus
 #else
+#ifdef TARGET_OS2
 #include "isapnp.h"
+#else /* !TARGET_OS2 */
+#include <linux/isapnp.h>
+#endif /* TARGET_OS2 */
 #endif
 #undef __ISAPNP__
@@ -149 +157 @@
 #endif
 
-#if 0
-static inline mm_segment_t snd_enter_user(void)
-{
-        mm_segment_t fs = get_fs();
-        set_fs(get_ds());
-        return fs;
-}
-static inline void snd_leave_user(mm_segment_t fs)
-{
-        set_fs(fs);
-}
-
-static inline void dec_mod_count(struct module *module)
-{
-        if (module)
-                __MOD_DEC_USE_COUNT(module);
-}
+/* no vsnprintf yet? */
+/* FIXME: the version number is not sure.. at least it exists already on 2.4.10 */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 10) && !TARGET_OS2
+#define snprintf(buf,size,fmt,args...) sprintf(buf,fmt,##args)
+#define vsnprintf(buf,size,fmt,args) vsprintf(buf,fmt,args)
 #endif
 

GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

@@ -10 +10 @@
 #include <linux/pagemap.h>
 #include <linux/ioport.h>
+
+#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE))
+/* include linux/usb.h at first since it defines another compatibility layers, which
+ * conflicts with ours...
+ */
+#include <linux/usb.h>
+#undef IORESOURCE_IO
+#endif
 
 #ifndef CONFIG_HAVE_DMA_ADDR_T
@@ -60 +68 @@
 #define rw_semaphore semaphore
 #define init_rwsem(x) init_MUTEX(x)
+#define DECLARE_RWSEM(x) DECLARE_MUTEX(x)
 #define down_read(x) down(x)
 #define down_write(x) down(x)
@@ -86 +95 @@
 void snd_wrapper_kill_fasync(struct fasync_struct **, int, int);
 
-#define tasklet_hi_schedule(t)  queue_task((t), &tq_immediate); \
-                                mark_bh(IMMEDIATE_BH)
-
-#define tasklet_init(t,f,d)     (t)->next = NULL; \
-                                (t)->sync = 0; \
-                                (t)->routine = (void (*)(void *))(f); \
-                                (t)->data = (void *)(d)
-
-#define tasklet_struct          tq_struct 
+/* this is identical with tq_struct but the "routine" field is renamed to "func" */
+struct tasklet_struct {
+        struct tasklet_struct *next;    /* linked list of active bh's */
+        unsigned long sync;             /* must be initialized to zero */
+        void (*func)(void *);           /* function to call */
+        void *data;                     /* argument to function */
+};
+
+#define tasklet_hi_schedule(t)  do { \
+        queue_task((struct tq_struct *)(t), &tq_immediate);\
+        mark_bh(IMMEDIATE_BH); \
+} while (0)
+
+#define tasklet_init(t,f,d)     do { \
+        (t)->next = NULL; \
+        (t)->sync = 0; \
+        (t)->func = (void (*)(void *))(f); \
+        (t)->data = (void *)(d); \
+} while (0)
 
 #define tasklet_unlock_wait(t)  while (test_bit(0, &(t)->sync)) { }
+#define tasklet_kill(t)         tasklet_unlock_wait(t) /* FIXME: world is not perfect... */
 
 #define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
@@ -138 +158 @@
   #define module_exit(x)
   #define THIS_MODULE NULL
-  #define try_inc_mod_count(x) do { ; } while (0)
+  #define try_inc_mod_count(x) 1
 #endif
 
@@ -194 +214 @@
 void snd_wrapper_request_region(unsigned long from, unsigned long extent, const char *name);
 #undef request_region
-#define request_region snd_compat_request_region
-#define release_resource snd_compat_release_resource
-#define request_mem_region(from, size, name) (&snd_compat_mem_region)
-
-extern struct resource snd_compat_mem_region;
-
-struct resource *snd_compat_request_region(unsigned long start, unsigned long size, const char *name);
+#define request_region(start,size,name) snd_compat_request_region(start,size,name,0)
+#define request_mem_region(start,size,name) snd_compat_request_region(start,size,name,1)
+#define release_resource(res) snd_compat_release_resource(res)
+
+struct resource *snd_compat_request_region(unsigned long start, unsigned long size, const char *name, int is_memory);
 int snd_compat_release_resource(struct resource *resource);
 
@@ -282 +300 @@
 int snd_pci_compat_register_driver(struct pci_driver *drv);
 void snd_pci_compat_unregister_driver(struct pci_driver *drv);
+struct pci_driver *snd_pci_compat_get_pci_driver(struct pci_dev *dev);
 unsigned long snd_pci_compat_get_size (struct pci_dev *dev, int n_base);
 int snd_pci_compat_get_flags (struct pci_dev *dev, int n_base);
@@ -291 +310 @@
 int snd_pci_compat_dma_supported(struct pci_dev *, dma_addr_t mask);
 unsigned long snd_pci_compat_get_dma_mask(struct pci_dev *);
-void snd_pci_compat_set_dma_mask(struct pci_dev *, unsigned long mask);
+int snd_pci_compat_set_dma_mask(struct pci_dev *, unsigned long mask);
 void * snd_pci_compat_get_driver_data (struct pci_dev *dev);
 void snd_pci_compat_set_driver_data (struct pci_dev *dev, void *driver_data);

GPL/branches/alsa-resync1/alsa-kernel/include/sound/isapnp.h

@@ -16 +16 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
  */