Changeset 234


Ignore:
Timestamp:
Aug 6, 2007, 1:06:53 AM (13 years ago)
Author:
Brendan Oakley
Message:

Merged previously missed headers to 0.9.2

Location:
GPL/branches/alsa-resync1/alsa-kernel/include/sound
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/adriver.h

    r215 r234  
    101101#ifndef mk_kdev
    102102#define mk_kdev(maj, min) MKDEV(maj, min)
     103#endif
     104#ifndef DECLARE_BITMAP
     105#define DECLARE_BITMAP(name,bits) \
     106        unsigned long name[((bits)+BITS_PER_LONG-1)/BITS_PER_LONG]
    103107#endif
    104108
     
    135139#define isapnp_card pci_bus
    136140#else
     141#ifdef TARGET_OS2
    137142#include "isapnp.h"
     143#else /* !TARGET_OS2 */
     144#include <linux/isapnp.h>
     145#endif /* TARGET_OS2 */
    138146#endif
    139147#undef __ISAPNP__
     
    149157#endif
    150158
    151 #if 0
    152 static inline mm_segment_t snd_enter_user(void)
    153 {
    154         mm_segment_t fs = get_fs();
    155         set_fs(get_ds());
    156         return fs;
    157 }
    158 static inline void snd_leave_user(mm_segment_t fs)
    159 {
    160         set_fs(fs);
    161 }
    162 
    163 static inline void dec_mod_count(struct module *module)
    164 {
    165         if (module)
    166                 __MOD_DEC_USE_COUNT(module);
    167 }
     159/* no vsnprintf yet? */
     160/* FIXME: the version number is not sure.. at least it exists already on 2.4.10 */
     161#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 10) && !TARGET_OS2
     162#define snprintf(buf,size,fmt,args...) sprintf(buf,fmt,##args)
     163#define vsnprintf(buf,size,fmt,args) vsprintf(buf,fmt,args)
    168164#endif
    169165
  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/compat_22.h

    r206 r234  
    1010#include <linux/pagemap.h>
    1111#include <linux/ioport.h>
     12
     13#if defined(SND_NEED_USB_WRAPPER) && (defined(CONFIG_USB) || defined(CONFIG_USB_MODULE))
     14/* include linux/usb.h at first since it defines another compatibility layers, which
     15 * conflicts with ours...
     16 */
     17#include <linux/usb.h>
     18#undef IORESOURCE_IO
     19#endif
    1220
    1321#ifndef CONFIG_HAVE_DMA_ADDR_T
     
    6068#define rw_semaphore semaphore
    6169#define init_rwsem(x) init_MUTEX(x)
     70#define DECLARE_RWSEM(x) DECLARE_MUTEX(x)
    6271#define down_read(x) down(x)
    6372#define down_write(x) down(x)
     
    8695void snd_wrapper_kill_fasync(struct fasync_struct **, int, int);
    8796
    88 #define tasklet_hi_schedule(t)  queue_task((t), &tq_immediate); \
    89                                 mark_bh(IMMEDIATE_BH)
    90 
    91 #define tasklet_init(t,f,d)     (t)->next = NULL; \
    92                                 (t)->sync = 0; \
    93                                 (t)->routine = (void (*)(void *))(f); \
    94                                 (t)->data = (void *)(d)
    95 
    96 #define tasklet_struct          tq_struct
     97/* this is identical with tq_struct but the "routine" field is renamed to "func" */
     98struct tasklet_struct {
     99        struct tasklet_struct *next;    /* linked list of active bh's */
     100        unsigned long sync;             /* must be initialized to zero */
     101        void (*func)(void *);           /* function to call */
     102        void *data;                     /* argument to function */
     103};
     104
     105#define tasklet_hi_schedule(t)  do { \
     106        queue_task((struct tq_struct *)(t), &tq_immediate);\
     107        mark_bh(IMMEDIATE_BH); \
     108} while (0)
     109
     110#define tasklet_init(t,f,d)     do { \
     111        (t)->next = NULL; \
     112        (t)->sync = 0; \
     113        (t)->func = (void (*)(void *))(f); \
     114        (t)->data = (void *)(d); \
     115} while (0)
    97116
    98117#define tasklet_unlock_wait(t)  while (test_bit(0, &(t)->sync)) { }
     118#define tasklet_kill(t)         tasklet_unlock_wait(t) /* FIXME: world is not perfect... */
    99119
    100120#define rwlock_init(x) do { *(x) = RW_LOCK_UNLOCKED; } while(0)
     
    138158  #define module_exit(x)
    139159  #define THIS_MODULE NULL
    140   #define try_inc_mod_count(x) do { ; } while (0)
     160  #define try_inc_mod_count(x) 1
    141161#endif
    142162
     
    194214void snd_wrapper_request_region(unsigned long from, unsigned long extent, const char *name);
    195215#undef request_region
    196 #define request_region snd_compat_request_region
    197 #define release_resource snd_compat_release_resource
    198 #define request_mem_region(from, size, name) (&snd_compat_mem_region)
    199 
    200 extern struct resource snd_compat_mem_region;
    201 
    202 struct resource *snd_compat_request_region(unsigned long start, unsigned long size, const char *name);
     216#define request_region(start,size,name) snd_compat_request_region(start,size,name,0)
     217#define request_mem_region(start,size,name) snd_compat_request_region(start,size,name,1)
     218#define release_resource(res) snd_compat_release_resource(res)
     219
     220struct resource *snd_compat_request_region(unsigned long start, unsigned long size, const char *name, int is_memory);
    203221int snd_compat_release_resource(struct resource *resource);
    204222
     
    282300int snd_pci_compat_register_driver(struct pci_driver *drv);
    283301void snd_pci_compat_unregister_driver(struct pci_driver *drv);
     302struct pci_driver *snd_pci_compat_get_pci_driver(struct pci_dev *dev);
    284303unsigned long snd_pci_compat_get_size (struct pci_dev *dev, int n_base);
    285304int snd_pci_compat_get_flags (struct pci_dev *dev, int n_base);
     
    291310int snd_pci_compat_dma_supported(struct pci_dev *, dma_addr_t mask);
    292311unsigned long snd_pci_compat_get_dma_mask(struct pci_dev *);
    293 void snd_pci_compat_set_dma_mask(struct pci_dev *, unsigned long mask);
     312int snd_pci_compat_set_dma_mask(struct pci_dev *, unsigned long mask);
    294313void * snd_pci_compat_get_driver_data (struct pci_dev *dev);
    295314void snd_pci_compat_set_driver_data (struct pci_dev *dev, void *driver_data);
  • GPL/branches/alsa-resync1/alsa-kernel/include/sound/isapnp.h

    r32 r234  
    1616 *   You should have received a copy of the GNU General Public License
    1717 *   along with this program; if not, write to the Free Software
    18  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
     18 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
    1919 *
    2020 */
Note: See TracChangeset for help on using the changeset viewer.