Ignore:
Timestamp:
Apr 3, 2017, 4:51:56 PM (8 years ago)
Author:
David Azarewicz
Message:

Merged/reintegrated v2 branch into trunk. Trunk is now v2

Location:
GPL/trunk
Files:
2 deleted
16 edited
1 copied

Legend:

Unmodified
Added
Removed

  • GPL/trunk

  • GPL/trunk/include/linux/compiler-gcc3.h

    r587 r598  
    66#define inline __inline
    77#define INLINE inline
    8 #define __attribute__(a)
     8#define __attribute__
    99
    1010#if __GNUC_MINOR__ >= 1  && __GNUC_MINOR__ < 4

  • GPL/trunk/include/linux/config.h

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

  • GPL/trunk/include/linux/dmi.h

    r476 r598  
    44#define dmi_find_device(a, b, c)        NULL
    55#define DMI_DEV_TYPE_OEM_STRING         -2
    6 #endif _LINUX_DMI_H
    76
     7struct dmi_device {
     8      struct list_head list;
     9      int type;
     10      const char *name;
     11      void *device_data;      /* Type specific data */
     12};
     13
     14#endif /* _LINUX_DMI_H */
     15

  • GPL/trunk/include/linux/fs.h

    r587 r598  
    88 * upper limit on files-per-process.
    99 *
    10  * Some programs (notably those using select()) may have to be
    11  * recompiled to take full advantage of the new limits..
     10 * Some programs (notably those using select()) may have to be 
     11 * recompiled to take full advantage of the new limits.. 
    1212 */
    1313
    … …  
    6363
    6464/* public flags for file_system_type */
    65 #define FS_REQUIRES_DEV 1
     65#define FS_REQUIRES_DEV 1 
    6666#define FS_NO_DCACHE    2 /* Only dcache the necessary things. */
    6767#define FS_NO_PRELIM    4 /* prevent preloading of dentries, even if
    … …  
    265265extern void kill_fasync(struct fasync_struct *, int, int);
    266266
    267 #define fops_get(x) ((struct file_operations *)x)
     267#define fops_get(x) (x)
    268268#define fops_put(x) do { ; } while (0)
    269269
    … …  
    273273#define imajor(x) major((x)->i_rdev)
    274274
     275#define no_llseek       NULL
     276#define nonseekable_open(i,f) 0
     277
    275278#endif /* _LINUX_FS_H */

  • GPL/trunk/include/linux/gcd.h

    r487 r598  
    11#ifndef _LINUX_GCD_H
    22#define _LINUX_GCD_H
    3 
     3unsigned long gcd(unsigned long a, unsigned long b);
    44#endif /* _LINUX_GCD_H */

  • GPL/trunk/include/linux/init.h

    r441 r598  
    138138#define __devexit_p(x) x
    139139
     140/* subsys_initcall() wrapper */
     141#define subsys_initcall(x) module_init(x)
     142
    140143#endif /* _LINUX_INIT_H */

  • GPL/trunk/include/linux/kernel.h

    r442 r598  
    102102#define upper_32_bits(n) ((u32)(((n) >> 16) >> 16))
    103103#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
     104int strict_strtoul(const char *, unsigned int, unsigned long *);
    104105
    105106#endif

  • GPL/trunk/include/linux/log2.h

    r305 r598  
    1 /* $Id: log2.h,v 1.1.1.1 2003/07/02 13:57:00 eleph Exp $ */
    2 
    31#ifndef _LINUX_LOG2_H
    42#define _LINUX_LOG2_H

  • GPL/trunk/include/linux/mm.h

    r441 r598  
    173173#define SetPageReserved(a)              a
    174174#define ClearPageReserved(a)            a
    175 
     175struct page *vmalloc_to_page(void *addr);
    176176#endif

  • GPL/trunk/include/linux/module.h

    r442 r598  
    4949#define MODULE_PARM_DESC(var,desc)
    5050#define MODULE_LICENSE(a)
     51#define EXPORT_SYMBOL_GPL(a)
    5152#else
    5253#define MODULE_PARM(var,type)                   \
    … …  
    7576#define MODULE_DEVICE_TABLE(type,name)
    7677#define EXPORT_SYMBOL(a)
    77 
     78#define MODULE_ALIAS_CHARDEV(x)
     79#define module_param(name, type, perm)
    7880#endif /* _LINUX_MODULE_H */

  • GPL/trunk/include/linux/pci.h

    r547 r598  
    719719        PCI_ANY_ID, PCI_ANY_ID, 0, 0
    720720
     721#define pci_clear_master(x)
     722
     723/* originally it's __devinitconst but we use __devinitdata to be compatible
     724 * with older kernels
     725 */
     726#define DEFINE_PCI_DEVICE_TABLE(_table) \
     727        const struct pci_device_id _table[] __devinitdata
     728
    721729#endif /* LINUX_PCI_H */

  • GPL/trunk/include/linux/pnp.h

    r587 r598  
    1313#ifdef __KERNEL__
    1414
     15#ifndef TARGET_OS2
    1516#include <linux/isapnp.h>
     17#else /* TARGET_OS2 */
     18#include <sound/isapnp.h>
     19#endif /* TARGET_OS2 */
    1620#include <linux/list.h>
    1721#include <linux/pm.h>

  • GPL/trunk/include/linux/types.h

    r442 r598  
    22#define _LINUX_TYPES_H
    33
    4 #pragma off (unreferenced)
     4//#pragma off (unreferenced)
    55
    66#include <linux/posix_types.h>
    … …  
    111111};
    112112
    113 #define __inline__ __inline 
     113#define __inline__ __inline
    114114
    115115#ifdef FLATSTACK
    … …  
    138138typedef unsigned int fmode_t;
    139139
     140//typedef int _Bool;
     141typedef _Bool bool;
     142
    140143#endif /* _LINUX_TYPES_H */

  • GPL/trunk/include/linux/vmalloc.h

    r32 r598  
    55//#include <linux/mm.h>
    66
    7 //#include <asm/pgtable.h>
     7#include <asm/page.h>
     8
    89
    910struct vm_struct {

  • GPL/trunk/include/linux/workqueue.h

    r587 r598  
    33
    44#include <linux/timer.h>
    5 #include <compat_22.h>
     5#include <sound/compat_22.h>
    66/* we know this is used below exactly once for at most one waiter */
    77
    … …  
    3333int queue_work(struct workqueue_struct *wq, struct work_struct *work);
    3434void flush_workqueue(struct workqueue_struct *wq);
     35int queue_delayed_work(struct workqueue_struct *wq, struct delayed_work *dwork, unsigned long delay);
     36int cancel_delayed_work(struct delayed_work *dwork);
    3537
    3638#define INIT_WORK(_work, _func, _data)                  \
    … …  
    5456#undef INIT_WORK
    5557#define INIT_WORK(w,f) snd_INIT_WORK(w,f)
     58#define INIT_DELAYED_WORK(_work, _func) INIT_WORK(&(_work)->work, _func)
     59#define work_pending(work) test_bit(0, &(work)->pending)
     60#define delayed_work_pending(w) work_pending(&(w)->work)
     61#define schedule_delayed_work(work, delay) queue_delayed_work(NULL, (work), (delay))
     62
    5663#define create_singlethread_workqueue(name) create_workqueue(name)
    57 
     64#define cancel_delayed_work_sync flush_delayed_work_sync
    5865#endif /* __LINUX_WORKQUEUE_H */
Note: See TracChangeset for help on using the changeset viewer.