Changeset 587 for GPL/trunk/include


Ignore:
Timestamp:
Jun 9, 2016, 10:38:13 PM (9 years ago)
Author:
David Azarewicz
Message:

Rearrange directory structure
rework makefiles
cleanup files

Location:
GPL/trunk/include
Files:
5 added
4 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • GPL/trunk/include/DEVINFO.H

    r32 r587  
    2626#if !defined(DevInfo_h)
    2727#define DevInfo_h 1
    28 
    29 #if !defined(__cplusplus)
    30 #error C++ must be used for strict type checking
    31 #endif
    32 
    3328
    3429// Include the fundamental type definitions

  • GPL/trunk/include/DEVTYPE.H

    r32 r587  
    2525#if !defined(DevType_h)
    2626#define DevType_h 1
    27 
    28 #if !defined(__WATCOMC__) || !defined(__cplusplus)
    29 #error Watcom C++ must be used for strict type checking.
    30 #endif
    3127
    3228#pragma pack(1)
    … …  
    10298  WORD16      Count;          // Count of bytes in queue
    10399  };
    104 template <int s> struct QUEUE : public QBASE
    105   {
    106   BYTE        Buffer[s];      // Queue buffer
    107   };
     100//template <int s> struct QUEUE : public QBASE
     101//  {
     102//  BYTE        Buffer[s];      // Queue buffer
     103//  };
    108104
    109105// Inter device driver communication structure
    … …  
    137133struct DEVHEADER
    138134  {
    139   DEVHEADER FAR* Link;        // Link to next header in chain
     135  struct DEVHEADER FAR* Link;        // Link to next header in chain
    140136  WORD16      DAWFlags;       // Device attribute word
    141137  VOID*       StrategyEntry;  // Entry point to strategy routine
    … …  
    147143
    148144// Constant for final DEVHEADER in chain
    149 #define       FinalLink       ((DEVHEADER FAR*)0xFFFFFFFFul)
     145#define       FinalLink       ((struct DEVHEADER FAR*)0xFFFFFFFFul)
    150146
    151147// Constants for device attribute word
    … …  
    182178#define OffsetBeginDS32        ((WORD32)&_OffBeginDS32)
    183179
    184 extern "C"
    185 {
     180//extern "C"
     181//{
    186182  extern BYTE _OffFinalCS32;               // End of resident code
    187183  extern BYTE _OffFinalDS32;               // End of resident code
    … …  
    190186  extern WORD16 _OffsetFinalCS16;
    191187  extern WORD16 _OffsetFinalDS16;
    192 }
     188//}
    193189
    194190#pragma pack()

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

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

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

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

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

    r446 r587  
    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) (x)
     267#define fops_get(x) ((struct file_operations *)x)
    268268#define fops_put(x) do { ; } while (0)
    269269

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

    r441 r587  
    1313#ifdef __KERNEL__
    1414
    15 #ifndef TARGET_OS2
    1615#include <linux/isapnp.h>
    17 #else /* TARGET_OS2 */
    18 #include <sound/isapnp.h>
    19 #endif /* TARGET_OS2 */
    2016#include <linux/list.h>
    2117#include <linux/pm.h>

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

    r444 r587  
    33
    44#include <linux/timer.h>
    5 #include <sound/compat_22.h>
     5#include <compat_22.h>
    66/* we know this is used below exactly once for at most one waiter */
    77

  • GPL/trunk/include/malloc.h

    r502 r587  
    3535void NEAR *malloc(ULONG size, const char *filename, int lineno);
    3636void       free(void *NEAR ptr, const char *filename, int lineno);
    37 void NEAR *realloc(void *NEAR ptr, unsigned newsize, const char *filename, int lineno);
     37void NEAR *realloc(void *NEAR ptr, unsigned long newsize, const char *filename, int lineno);
    3838#else
    3939void NEAR *malloc(ULONG size);
    4040void       free(void NEAR *);
    41 void NEAR *realloc(void NEAR *, unsigned);
     41void NEAR *realloc(void NEAR *, unsigned long);
    4242#endif
    4343

  • GPL/trunk/include/strategy.h

    r32 r587  
    1 /* $Id: strategy.h,v 1.1.1.1 2003/07/02 13:56:58 eleph Exp $ */
    2 /*
    3  * OS/2 strategy handler definitions
    4  *
    5  * (C) 2000-2002 InnoTek Systemberatung GmbH
    6  * (C) 2000-2001 Sander van Leeuwen (sandervl@xs4all.nl)
    7  *
    8  * This program is free software; you can redistribute it and/or
    9  * modify it under the terms of the GNU General Public License as
    10  * published by the Free Software Foundation; either version 2 of
    11  * the License, or (at your option) any later version.
    12  *
    13  * This program is distributed in the hope that it will be useful,
    14  * but WITHOUT ANY WARRANTY; without even the implied warranty of
    15  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    16  * GNU General Public License for more details.
    17  *
    18  * You should have received a copy of the GNU General Public
    19  * License along with this program; if not, write to the Free
    20  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139,
    21  * USA.
    22  *
    23  */
    24 
     1/****************************************************************************
     2 *                                                                          *
     3 * Copyright (c) IBM Corporation 1994 - 1997.                               *
     4 *                                                                          *
     5 * The following IBM OS/2 source code is provided to you solely for the     *
     6 * the purpose of assisting you in your development of OS/2 device drivers. *
     7 * You may use this code in accordance with the IBM License Agreement       *
     8 * provided in the IBM Device Driver Source Kit for OS/2.                   *
     9 *                                                                          *
     10 * Copyright (c) 2013 David Azarewicz david@88watts.net                     *
     11 * Modified to fix problems and for OpenWatcom compatibility                *
     12 ****************************************************************************/
    2513#ifndef STRATEGY_INCLUDED
    2614#define STRATEGY_INCLUDED
    2715
     16#pragma pack(1);
    2817
    29 /* Constants relating to the Strategy Routines
    30 */
     18typedef struct {              /* template for request header */
     19  BYTE bLength;               /* 00 request packet length */
     20  BYTE bUnit;                 /* 01 unit code for block DD only */
     21  BYTE bCommand;              /* 02 command code */
     22  USHORT usStatus;            /* 03 return status */
     23  ULONG dwReserved;           /* 05 reserved bytes */
     24  ULONG ulQlink;              /* 09 queue linkage */
     25  union {                     /* command-specific data */
     26    struct {
     27      BYTE b;                 /* 0D */
     28      PFN  ulDevHlp;          /* 0E dev help address */
     29      ULONG szArgs; /* 12 argument pointer */
     30      BYTE bDrive;            /* 16 */
     31    } init_in;
     32    struct {
     33      BYTE bUnits;
     34      USHORT usCodeEnd;       // final code offset
     35      USHORT usDataEnd;       // final data offset
     36      ULONG ul;
     37    } init_out;
     38    struct {
     39      BYTE bMedia;
     40      ULONG ulAddress;
     41      USHORT usCount;
     42      ULONG ulStartSector;
     43      USHORT usSysFileNum;
     44    } io;
     45    struct {
     46      BYTE bData;
     47    } peek;
     48    struct {
     49      BYTE bCategory;         // category code
     50      BYTE bFunction;         // function code
     51      ULONG pvParm; // address of parameter buffer
     52      ULONG pvData; // address of data buffer
     53      USHORT usSysFileNum;    // system file number
     54      USHORT usParmLen;       // length of parameter buffer
     55      USHORT usDataLen;       // length of data buffer
     56    } ioctl;
     57    struct {
     58      USHORT usSysFileNum;    // system file number
     59    } open_close;
     60    struct {
     61      BYTE   Function;        // Shutdown code: 0 = start, 1 = end
     62      ULONG  Reserved;        // Reserved
     63    } shutdown;
     64    struct {
     65      BYTE Function;
     66    } save_restore;
     67  };
     68} REQPACKET;
     69
     70#pragma pack();
     71
     72/* Constants relating to the Strategy Routines */
    3173
    3274#define RPDONE    0x0100         // return successful, must be set
    … …  
    3577#define RPERR     0x8000         // return error
    3678
    37 // List of error codes, from chapter 8 of PDD reference
    38 #define RPNOTREADY  0x0002
    39 #define RPBADCMD    0x0003
    40 #define RPGENFAIL   0x000c
    41 #define RPDEVINUSE  0x0014
    42 #define RPINITFAIL  0x0015
     79#define RPERR_PROTECT         0x8000
     80#define RPERR_UNIT            0x8001
     81#define RPERR_NOTREADY        0x8002
     82#define RPERR_BADCOMMAND      0x8003
     83#define RPERR_CRC             0x8004
     84#define RPERR_LENGTH          0x8005
     85#define RPERR_SEEK            0x8006
     86#define RPERR_FORMAT          0x8007
     87#define RPERR_SECTOR          0x8008
     88#define RPERR_PAPER           0x8009
     89#define RPERR_WRITE           0x800A
     90#define RPERR_READ            0x800B
     91#define RPERR_GENERAL         0x800C
     92#define RPERR_DISK            0x800D
     93#define RPERR_MEDIA           0x8010
     94#define RPERR_INTERRUPTED     0x8011
     95#define RPERR_MONITOR         0x8012
     96#define RPERR_PARAMETER       0x8013
     97#define RPERR_DEVINUSE        0x8014
     98#define RPERR_INITFAIL        0x8015
    4399
    44100// list of Strategy commands from PDD reference
    45 // Note this is only the list of commands audio device drivers care about
    46 #define STRATEGY_INIT          0x00
    47 #define STRATEGY_OPEN          0x0D
    48 #define STRATEGY_CLOSE         0x0E
    49 #define STRATEGY_GENIOCTL      0x10
    50 #define STRATEGY_DEINSTALL     0x14
    51 #define STRATEGY_INITCOMPLETE  0x1F
     101#define STRATEGY_INIT            0x00
     102#define STRATEGY_MEDIACHECK      0x01
     103#define STRATEGY_BUILDBPB        0x02
     104#define STRATEGY_IOCTLR          0x03
     105#define STRATEGY_READ            0x04
     106#define STRATEGY_NDR             0x05
     107#define STRATEGY_INPUTSTATUS     0x06
     108#define STRATEGY_FLUSHINPUT      0x07
     109#define STRATEGY_WRITE           0x08
     110#define STRATEGY_WRITEVERIFY     0x09
     111#define STRATEGY_OUTPUTSTATUS    0x0A
     112#define STRATEGY_FLUSHOUTPUT     0x0B
     113#define STRATEGY_IOCTLW          0x0C
     114#define STRATEGY_OPEN            0x0D
     115#define STRATEGY_CLOSE           0x0E
     116#define STRATEGY_REMOVEABLEMEDIA 0x0F
     117#define STRATEGY_GENIOCTL        0x10
     118#define STRATEGY_RESETMEDIA      0x11
     119#define STRATEGY_GETLOGMAP       0x12
     120#define STRATEGY_SETLOGMAP       0x13
     121#define STRATEGY_DEINSTALL       0x14
     122#define STRATEGY_PARTFIXEDDISKS  0x16
     123#define STRATEGY_GETFDLOGUNITMAP 0x17
     124#define STRATEGY_INPUTBYPASS     0x18
     125#define STRATEGY_OUTPUTBYPASS    0x19
     126#define STRATEGY_OUTPUTBYPASSV   0x1A
     127#define STRATEGY_BASEDEVINIT     0x1B
     128#define STRATEGY_SHUTDOWN        0x1C
     129#define STRATEGY_GETDRIVERCAPS   0x1D
     130#define STRATEGY_INITCOMPLETE    0x1F
     131#define STRATEGY_SAVERESTORE     0x20
     132
     133#define IOCTL_ASYNC            0x0001
     134#define IOCTL_SCR_AND_PTRDRAW  0x0003
     135#define IOCTL_KEYBOARD         0x0004
     136#define IOCTL_PRINTER          0x0005
     137#define IOCTL_LIGHTPEN         0x0006
     138#define IOCTL_POINTINGDEVICE   0x0007
     139#define IOCTL_DISK             0x0008
     140#define IOCTL_PHYSICALDISK     0x0009
     141#define IOCTL_MONITOR          0x000A
     142#define IOCTL_GENERAL          0x000B
     143#define IOCTL_POWER            0x000C
     144#define IOCTL_OEMHLP           0x0080
     145#define IOCTL_TESTCFG_SYS      0x0080
     146#define IOCTL_CDROMDISK        0x0080
     147#define IOCTL_CDROMAUDIO       0x0081
     148#define IOCTL_TOUCH_DEVDEP     0x0081
     149#define IOCTL_TOUCH_DEVINDEP   0x0081
    52150
    53151#endif
Note: See TracChangeset for help on using the changeset viewer.