Changeset 63 for GPL/trunk/include


Ignore:
Timestamp:
Jan 3, 2006, 11:33:10 PM (20 years ago)
Author:
vladest
Message:

(Patches by Ruediger Ihle)
Support for IRQs > 15
Fixed resource manager registration
Fixed crash on APM suspend/resume and system shutdown

Location:
GPL/trunk/include
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/include/asm/string.h

    r32 r63  
    1010int   strncmp (const char *string1, const char *string2, size_t count);
    1111
     12size_t strlcpy(char *dst, const char *src, size_t size);
     13
    1214#endif
    1315

  • GPL/trunk/include/irqos2.h

    r34 r63  
    2525#define __IRQOS2_H__
    2626
    27 //#define MAX_SHAREDIRQS          16
    28 //#define MAX_IRQS              16
    29 #define MAX_SHAREDIRQS          256 // ACPI
    30 #define MAX_IRQS                256 // ACPI
     27#define MAX_SHAREDIRQS          8
     28#define MAX_IRQ_SLOTS           8
    3129
    32 //typedef void (NEAR * IRQHANDLER)(int, void *, void *);
    33 typedef int (NEAR * IRQHANDLER)(int, void *, void *);
     30
     31typedef int (NEAR * IRQHANDLER)(int, void *, struct pt_regs *);
    3432
    3533typedef struct {
    … …  
    4038} IRQHANDLER_INFO;
    4139
    42 typedef BOOL (*PFNIRQ)(int irq);
     40typedef struct
     41{
     42  unsigned              irqNo;
     43  unsigned              fEOI;
     44  unsigned              flHandlers;
     45  IRQHANDLER_INFO       irqHandlers[MAX_SHAREDIRQS];
     46} IRQ_SLOT;
     47
    4348
    4449#ifdef __cplusplus
    … …  
    4651#endif
    4752
    48 BOOL RMSetIrq(ULONG ulIrq, BOOL fShared, PFNIRQ pfnIrqHandler);
    49 BOOL RMFreeIrq(ULONG ulIrq);
     53BOOL ALSA_SetIrq(ULONG ulIrq, ULONG ulSlotNo, BOOL fShared);
     54BOOL ALSA_FreeIrq(ULONG ulIrq);
    5055
    51 BOOL oss_process_interrupt(int irq);
     56BOOL process_interrupt(ULONG ulSlotNo, ULONG *pulIrq);
    5257
    5358ULONG os2gettimemsec();
    5459ULONG os2gettimesec();
    55 
    5660
    5761#ifdef __cplusplus

  • GPL/trunk/include/osspci.h

    r32 r63  
    3030#endif
    3131
    32 #define MAX_RES_IRQ     2
    33 #define MAX_RES_DMA     2
    34 #define MAX_RES_IO      8
    35 #define MAX_RES_MEM     8
    36 
    37 #define RM_PNP_DEVICE   0
    38 #define RM_PCI_DEVICE   1
    39 
    40 #define MAX_PCI_DEVICES         16
    41 #define MAX_PCI_BUSSES      16
    42 
    43     //#pragma pack(4) !!! by vladest
    44 #pragma pack(1)
    45 
    46 typedef struct
    47 {
    48     ULONG  busnr;
    49     ULONG  devnr;
    50     ULONG  funcnr;
    51     ULONG  devfn;
    52         USHORT irq[MAX_RES_IRQ];
    53         USHORT dma[MAX_RES_DMA];
    54         USHORT io[MAX_RES_IO];
    55         USHORT iolength[MAX_RES_IO];
    56         ULONG  mem[MAX_RES_MEM];
    57         ULONG  memlength[MAX_RES_MEM];
    58 } IDC_RESOURCE;
    59 
    60 #pragma pack()
    61 
    62 typedef ULONG HRESMGR;
    63 
    64 HRESMGR RMFindPCIDevice(ULONG vendorid, ULONG deviceid, IDC_RESOURCE *lpResource, int idx);
    65 BOOL    RMRequestIO(HRESMGR hResMgr, ULONG ulIOBase, ULONG ulIOLength);
    66 BOOL    RMRequestMem(HRESMGR hResMgr, ULONG ulMemBase, ULONG ulMemLength);
    67 BOOL    RMRequestIRQ(HRESMGR hResMgr, ULONG ulIrq, BOOL fShared);
    68 BOOL    RMRequestDMA(HRESMGR hResMgr, ULONG ulDMA);
    69 //register resources & destroy resource manager object
    70 void    RMFinialize(HRESMGR hResMgr);
    71 //destroy resource manager object
    72 void    RMDestroy(HRESMGR hResMgr);
    73 
    74 extern HRESMGR hResMgr;
    75 
     32VOID    RMInit(VOID);
     33BOOL    RMRequestIO(ULONG ulIOBase, ULONG ulIOLength);
     34BOOL    RMRequestMem(ULONG ulMemBase, ULONG ulMemLength);
     35BOOL    RMRequestIRQ(ULONG ulIrq, BOOL fShared);
     36VOID    RMDone(ULONG DevID);
    7637
    7738#ifdef __cplusplus

  • GPL/trunk/include/version.h

    r32 r63  
    2626#define __UNIAUDVERSION_H__
    2727
     28
     29#define BUILDER_NAME            "Netlabs"
     30#define PRODUCT_NAME            "OS/2 Universal Audio Driver"
     31#define VENDOR_NAME             "Netlabs"
     32#define PRODUCT_VERSION         "1.1.4"         // version
     33#define PRODUCT_TIMESTAMP       20051231L       // YYYYMMDD
     34
     35
    2836#define ALSA_VERSION            "1.1.3"
    2937#define RM_DRIVER_NAME          "UNIAUD32.SYS"
    … …  
    3139#define RM_ADAPTER_NAME         "OS/2 Universal Audio"
    3240#define RM_DRIVER_VENDORNAME    "InnoTek Systemberatung GmbH"
    33 #define RM_DRIVER_BUILDYEAR     2005
    34 #define RM_DRIVER_BUILDMONTH    01
    35 #define RM_DRIVER_BUILDDAY      06
    36 #define UNIAUD_VERSION          113
     41#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)
     42#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)
     43#define RM_DRIVER_BUILDDAY      (PRODUCT_TIMESTAMP % 100)
     44#define UNIAUD_VERSION          114
     45
    3746
    3847#endif //__UNIAUDVERSION_H__

  • GPL/trunk/include/version.mak

    r32 r63  
    1 # $Id: version.mak,v 1.1.1.1 2003/07/02 13:56:58 eleph Exp $
    2 
    31#
    4 
    52#       VERSION.MAK
    63#
    74#       Current build level for File Versioning
    85#
    9 #       This file should reside in the same place as COMMON.MAK
     6#       Generated file, do NOT edit !
    107#
    118
    12 _VENDOR = "OS/2 Universal Audio Driver"
    13 _VERSION = 1.13.001
    14 
    15 FILEVER = @^#$(_VENDOR):$(_VERSION)^#@
    16 
     9BLDLVL_VENDOR = NETLABS
     10BLDLVL_PRODUCT = OS/2 Universal Audio Driver
     11BLDLVL_REVISION = 1.1
     12BLDLVL_FILEVER = 4
     13BLDLVL_DATETIME = 04.01.2006 00:19:06
     14BLDLVL_MACHINE = VLAD
Note: See TracChangeset for help on using the changeset viewer.