Ignore:
Timestamp:
Mar 24, 2008, 2:43:42 AM (18 years ago)
Author:
Paul Smedley
Message:

Update source to ALSA 1.0.16 level

Location:
GPL/branches/uniaud-2.0/include/linux
Files:
22 added
12 edited

Legend:

Unmodified
Added
Removed

  • GPL/branches/uniaud-2.0/include/linux/config.h

    r32 r305  
    33#ifndef _LINUX_CONFIG_H
    44#define _LINUX_CONFIG_H
    5 
     5#include <sound/config.h>
    66#endif

  • GPL/branches/uniaud-2.0/include/linux/firmware.h

    r111 r305  
    11#ifndef _LINUX_FIRMWARE_H
    22#define _LINUX_FIRMWARE_H
    3 #include <linux/module.h>
    4 #include <linux/types.h>
    5 #define FIRMWARE_NAME_MAX 30
     3#define FIRMWARE_NAME_MAX 30
     4
    65struct firmware {
    7         size_t size;
    8         u8 *data;
     6        unsigned int size;
     7        unsigned char *data;
    98};
    10 struct device;
    11 int request_firmware(const struct firmware **fw, const char *name,
    12                      struct device *device);
    13 int request_firmware_nowait(
    14         struct module *module,
    15         const char *name, struct device *device, void *context,
    16         void (*cont)(const struct firmware *fw, void *context));
    179
    18 void release_firmware(const struct firmware *fw);
    19 void register_firmware(const char *name, const u8 *data, size_t size);
     10int snd_compat_request_firmware(const struct firmware **fw, const char *name);
     11void snd_compat_release_firmware(const struct firmware *fw);
     12
     13#define request_firmware(fw, name, device) snd_compat_request_firmware(fw, name)
     14#define release_firmware(fw) snd_compat_release_firmware(fw)
     15
     16#define NEEDS_COMPAT_FW_LOADER
     17
    2018#endif

  • GPL/branches/uniaud-2.0/include/linux/fs.h

    r129 r305  
    187187        kdev_t                  i_rdev;
    188188        struct semaphore        i_sem;
     189        union {
     190                void            *generic_ip;
     191        } u;
     192
    189193#else
    190194         void * i_hash;

  • GPL/branches/uniaud-2.0/include/linux/interrupt.h

    r125 r305  
    7070 */
    7171
    72 struct tasklet_struct
    73 {
    74         struct tasklet_struct *next;
    75         unsigned long state;
    76         atomic_t count;
    77         void (*func)(unsigned long);
    78         unsigned long data;
     72struct tasklet_struct {
     73        struct tasklet_struct *next;    /* linked list of active bh's */
     74        unsigned long sync;             /* must be initialized to zero */
     75        void (*func)(void *);           /* function to call */
     76        void *data;                     /* argument to function */
    7977};
    8078

  • GPL/branches/uniaud-2.0/include/linux/mm.h

    r32 r305  
    135135extern unsigned long virt_to_phys(void * address);
    136136
    137 extern mem_map_t *virt_to_page(int x);
     137//extern mem_map_t *virt_to_page(int x);
     138#define virt_to_page(x) (&mem_map[MAP_NR(x)])
    138139
    139140extern void * phys_to_virt(unsigned long address);

  • GPL/branches/uniaud-2.0/include/linux/moduleparam.h

    r32 r305  
    6666        module_param_call(name, param_set_##type, param_get_##type, &value, perm)
    6767
     68#ifndef TARGET_OS2
    6869#define module_param(name, type, perm)                          \
    6970        module_param_named(name, name, type, perm)
    70 
     71#endif
    7172/* Actually copy string: maxlen param is usually sizeof(string). */
    7273#define module_param_string(name, string, len, perm)                    \
    … …  
    137138                          &__param_arr_##name, perm)
    138139
     140#ifndef TARGET_OS2
    139141#define module_param_array(name, type, nump, perm)              \
    140142        module_param_array_named(name, name, type, nump, perm)
    141 
     143#endif
    142144extern int param_array_set(const char *val, struct kernel_param *kp);
    143145extern int param_array_get(char *buffer, struct kernel_param *kp);

  • GPL/branches/uniaud-2.0/include/linux/pci.h

    r289 r305  
    1616#define LINUX_PCI_H
    1717
     18#include <linux/types.h>
     19#include <linux/list.h>
    1820#pragma pack(1) //!!! by vladest
    1921/*
    … …  
    285287
    286288#include <asm/pci.h>
    287 
     289#define BUS_ID_SIZE             20
    288290#define DEVICE_COUNT_COMPATIBLE 4
    289291#define DEVICE_COUNT_IRQ        2
    … …  
    293295typedef struct pci_dev;
    294296
     297
     298
    295299typedef struct device {
    296300    struct pci_dev *pci;        /* for PCI and PCI-SG types */
     301        struct device   * parent;
     302        struct bus_type * bus;          /* type of bus device is on */
     303        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
     304        void    (*release)(struct device * dev);
    297305    unsigned int flags; /* GFP_XXX for continous and ISA types */
    298306#ifdef CONFIG_SBUS
    299307    struct sbus_dev *sbus;      /* for SBUS type */
    300308#endif
     309        void *private_data;
     310        struct device_driver *driver;
     311        struct pm_dev *pm_dev;
     312        char    bus_id[20];
    301313} device;
    302314
    … …  
    648660
    649661unsigned long pci_get_dma_mask(struct pci_dev *);
    650 int pci_set_dma_mask(struct pci_dev *, unsigned long mask);
     662void pci_set_dma_mask(struct pci_dev *, unsigned long mask);
     663
    651664
    652665void *pci_get_driver_data (struct pci_dev *dev);

  • GPL/branches/uniaud-2.0/include/linux/pm.h

    r32 r305  
    1 /* $Id: pm.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
     1/*
     2 *  pm.h - Power management interface
     3 *
     4 *  Copyright (C) 2000 Andrew Henroid
     5 *
     6 *  This program is free software; you can redistribute it and/or modify
     7 *  it under the terms of the GNU General Public License as published by
     8 *  the Free Software Foundation; either version 2 of the License, or
     9 *  (at your option) any later version.
     10 *
     11 *  This program is distributed in the hope that it will be useful,
     12 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
     13 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14 *  GNU General Public License for more details.
     15 *
     16 *  You should have received a copy of the GNU General Public License
     17 *  along with this program; if not, write to the Free Software
     18 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
     19 */
    220
    321#ifndef _LINUX_PM_H
    422#define _LINUX_PM_H
    523
    6 
    7 #endif /* _LINUX_IOCTL_H */
    8 
     24#ifdef __KERNEL__
     25
     26#include <linux/config.h>
     27#include <linux/list.h>
     28#include <asm/atomic.h>
     29
     30/*
     31 * Power management requests
     32 */
     33enum
     34{
     35        PM_SUSPEND, /* enter D1-D3 */
     36        PM_RESUME,  /* enter D0 */
     37
     38        PM_SAVE_STATE,  /* save device's state */
     39
     40        /* enable wake-on */
     41        PM_SET_WAKEUP,
     42
     43        /* bus resource management */
     44        PM_GET_RESOURCES,
     45        PM_SET_RESOURCES,
     46
     47        /* base station management */
     48        PM_EJECT,
     49        PM_LOCK,
     50};
     51
     52typedef int pm_request_t;
     53
     54/*
     55 * Device types
     56 */
     57enum
     58{
     59        PM_UNKNOWN_DEV = 0, /* generic */
     60        PM_SYS_DEV,         /* system device (fan, KB controller, ...) */
     61        PM_PCI_DEV,         /* PCI device */
     62        PM_USB_DEV,         /* USB device */
     63        PM_SCSI_DEV,        /* SCSI device */
     64        PM_ISA_DEV,         /* ISA device */
     65        PM_MTD_DEV,         /* Memory Technology Device */
     66};
     67
     68typedef int pm_dev_t;
     69
     70/*
     71 * System device hardware ID (PnP) values
     72 */
     73enum
     74{
     75        PM_SYS_UNKNOWN = 0x00000000, /* generic */
     76        PM_SYS_KBC =     0x41d00303, /* keyboard controller */
     77        PM_SYS_COM =     0x41d00500, /* serial port */
     78        PM_SYS_IRDA =    0x41d00510, /* IRDA controller */
     79        PM_SYS_FDC =     0x41d00700, /* floppy controller */
     80        PM_SYS_VGA =     0x41d00900, /* VGA controller */
     81        PM_SYS_PCMCIA =  0x41d00e00, /* PCMCIA controller */
     82};
     83
     84/*
     85 * Device identifier
     86 */
     87#define PM_PCI_ID(dev) ((dev)->bus->number << 16 | (dev)->devfn)
     88
     89/*
     90 * Request handler callback
     91 */
     92struct pm_dev;
     93
     94typedef int (*pm_callback)(struct pm_dev *dev, pm_request_t rqst, void *data);
     95
     96/*
     97 * Dynamic device information
     98 */
     99struct pm_dev
     100{
     101        pm_dev_t         type;
     102        unsigned long    id;
     103        pm_callback      callback;
     104        void            *data;
     105
     106        unsigned long    flags;
     107        unsigned long    state;
     108        unsigned long    prev_state;
     109
     110        struct list_head entry;
     111};
     112
     113#ifdef CONFIG_PM
     114
     115extern int pm_active;
     116
     117#define PM_IS_ACTIVE() (pm_active != 0)
     118
     119/*
     120 * Register a device with power management
     121 */
     122struct pm_dev *pm_register(pm_dev_t type,
     123                           unsigned long id,
     124                           pm_callback callback);
     125
     126/*
     127 * Unregister a device with power management
     128 */
     129void pm_unregister(struct pm_dev *dev);
     130
     131/*
     132 * Unregister all devices with matching callback
     133 */
     134void pm_unregister_all(pm_callback callback);
     135
     136/*
     137 * Send a request to a single device
     138 */
     139int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data);
     140
     141/*
     142 * Send a request to all devices
     143 */
     144int pm_send_all(pm_request_t rqst, void *data);
     145
     146/*
     147 * Find a device
     148 */
     149struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from);
     150
     151static inline void pm_access(struct pm_dev *dev) {}
     152static inline void pm_dev_idle(struct pm_dev *dev) {}
     153
     154#else /* CONFIG_PM */
     155
     156#define PM_IS_ACTIVE() 0
     157
     158static inline struct pm_dev *pm_register(pm_dev_t type,
     159                                         unsigned long id,
     160                                         pm_callback callback)
     161{
     162        return 0;
     163}
     164
     165static inline void pm_unregister(struct pm_dev *dev) {}
     166
     167static inline void pm_unregister_all(pm_callback callback) {}
     168
     169static inline int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data)
     170{
     171        return 0;
     172}
     173
     174static inline int pm_send_all(pm_request_t rqst, void *data)
     175{
     176        return 0;
     177}
     178
     179static inline struct pm_dev *pm_find(pm_dev_t type, struct pm_dev *from)
     180{
     181        return 0;
     182}
     183
     184static inline void pm_access(struct pm_dev *dev) {}
     185static inline void pm_dev_idle(struct pm_dev *dev) {}
     186
     187#endif /* CONFIG_PM */
     188
     189
     190/*
     191 * Callbacks for platform drivers to implement.
     192 */
     193extern void (*pm_idle)(void);
     194extern void (*pm_power_off)(void);
     195
     196enum {
     197        PM_SUSPEND_ON,
     198        PM_SUSPEND_STANDBY,
     199        PM_SUSPEND_MEM,
     200        PM_SUSPEND_DISK,
     201        PM_SUSPEND_MAX,
     202};
     203
     204enum {
     205        PM_DISK_FIRMWARE = 1,
     206        PM_DISK_PLATFORM,
     207        PM_DISK_SHUTDOWN,
     208        PM_DISK_REBOOT,
     209        PM_DISK_MAX,
     210};
     211
     212
     213struct pm_ops {
     214        u32     pm_disk_mode;
     215        int (*prepare)(u32 state);
     216        int (*enter)(u32 state);
     217        int (*finish)(u32 state);
     218};
     219
     220extern void pm_set_ops(struct pm_ops *);
     221
     222extern int pm_suspend(u32 state);
     223
     224
     225/*
     226 * Device power management
     227 */
     228
     229struct device;
     230
     231struct dev_pm_info {
     232#ifdef  CONFIG_PM
     233        u32                     power_state;
     234        u8                      * saved_state;
     235        atomic_t                pm_users;
     236        struct device           * pm_parent;
     237        struct list_head        entry;
     238#endif
     239};
     240
     241extern void device_pm_set_parent(struct device * dev, struct device * parent);
     242
     243extern int device_suspend(u32 state);
     244extern int device_power_down(u32 state);
     245extern void device_power_up(void);
     246extern void device_resume(void);
     247
     248
     249#endif /* __KERNEL__ */
     250
     251#endif /* _LINUX_PM_H */

  • GPL/branches/uniaud-2.0/include/linux/proc_fs.h

    r124 r305  
    107107extern struct proc_dir_entry *create_proc_entry(const char *name, mode_t mode,
    108108                                                struct proc_dir_entry *parent);
     109
    109110extern void remove_proc_entry(const char *name, struct proc_dir_entry *parent);
    110111
    … …  
    229230struct proc_dir_entry *create_proc_info_entry(const char *name,
    230231        mode_t mode, struct proc_dir_entry *base, get_info_t *get_info);
    231 struct proc_dir_entry *proc_net_create(const char *name);
    232232void proc_net_remove(const char *name);
    233233

  • GPL/branches/uniaud-2.0/include/linux/rwsem.h

    r298 r305  
     1/* $Id: rwsem.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
     2
    13#ifndef _LINUX_RWSEM_H
    24#define _LINUX_RWSEM_H
    35
    4 /*
    5  * This file is part of Uniaud32.
    6  * Copyright (c) 2008 Netlabs
    7  *
    8  *  Uniaud32 is free software: you can redistribute it and/or modify
    9  *  it under the terms of the GNU General Public License version 2
    10  *  as published by the Free Software Foundation.
    11  *
    12  *  Uniaud32 is distributed in the hope that it will be useful,
    13  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  *  GNU General Public License for more details.
    16  *
    17  *  You should have received a copy of the GNU General Public License
    18  *  along with Uniaud32.  If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 
    21 /*
    22  * rwsem.h --- R/W Semaphores, public interface
    23  */
    24 
    25 
    266#endif /* _LINUX_RWSEM_H */

  • GPL/branches/uniaud-2.0/include/linux/string.h

    r32 r305  
    11#ifndef _LINUX_STRING_H
    22#define _LINUX_STRING_H
    3 
     3#if 0
    44char *strstr1 (const char *string1, const char *string2);
    55
    … …  
    99
    1010int   strncmp (const char *string1, const char *string2, size_t count);
    11 
     11#endif
    1212#endif
    1313

  • GPL/branches/uniaud-2.0/include/linux/workqueue.h

    r298 r305  
    1 #ifndef _LINUX_WORKQUEUE_H
    2 #define _LINUX_WORKQUEUE_H
    3 
    4 /*
    5  * This file is part of Uniaud32.
    6  * Copyright (c) 2008 Netlabs
    7  *
    8  *  Uniaud32 is free software: you can redistribute it and/or modify
    9  *  it under the terms of the GNU General Public License version 2
    10  *  as published by the Free Software Foundation.
    11  *
    12  *  Uniaud32 is distributed in the hope that it will be useful,
    13  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
    14  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    15  *  GNU General Public License for more details.
    16  *
    17  *  You should have received a copy of the GNU General Public License
    18  *  along with Uniaud32.  If not, see <http://www.gnu.org/licenses/>.
    19  */
    20 
    21 /*
    22  * workqueue.h --- Linux work queue handling for OS/2 and eComStation.
    23  */
    24 
    25 
    26 #endif /* _LINUX_WORKQUEUE_H */
     1#ifndef __LINUX_WORKQUEUE_H
     2#define __LINUX_WORKQUEUE_H
     3#endif /* __LINUX_WORKQUEUE_H */
Note: See TracChangeset for help on using the changeset viewer.