Changeset 675


Ignore:
Timestamp:
Feb 15, 2021, 9:44:30 AM (4 years ago)
Author:
Paul Smedley
Message:

More code cleanups from AlexT from #os2russian

Location:
GPL/branches/uniaud32-next
Files:
1 added
5 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified GPL/branches/uniaud32-next/drv32/Makefile

    r667 r675  
    5555
    5656FILES = begin.obj startup.obj strategy.obj read.obj init.obj parse.obj idc.obj &
    57         dispatch.obj rmhelp.obj irq.obj util.obj impdos.lib impkee.lib end.obj
     57        dispatch.obj rmhelp.obj irq.obj impdos.lib impkee.lib end.obj
    5858
    5959LIBS = $(ALSA_LIB)\linuxlib.lib $(ALSA_LIB)\core.lib $(ALSA_LIB)\ac97.lib $(ALSA_LIB)\pci.lib &

  • TabularUnified GPL/branches/uniaud32-next/drv32/devown.h

    r32 r675  
    2323 */
    2424
    25 
    26 extern WORD32 deviceOwner;
    27 extern WORD32 numOS2Opens;
    28 
    2925#define DEV_NO_OWNER            0
    3026#define DEV_PDD_OWNER           1       //owner is still unknown

  • TabularUnified GPL/branches/uniaud32-next/drv32/dispatch.c

    r598 r675  
    2929#include <dbgos2.h>
    3030#include <devhelp.h>
    31 #include <devtype.h>
    32 #include <strategy.h>
    33 #include "devown.h"
    3431#include <ossidc.h>
    3532#include <ossidc32.h>
    3633#include <version.h>
    37 
    38 extern int cdecl printk(const char * fmt, ...);
    39 //******************************************************************************
    40 // Dispatch IOCtl requests received from the Strategy routine
    41 //******************************************************************************
    42 extern int GetUniaudCardInfo(ULONG deviceid, void *info);
    43 extern int GetUniaudControlNum(ULONG deviceid);
    44 extern int GetUniaudControls(ULONG deviceid, void *pids);
    45 extern int GetUniaudControlInfo(ULONG deviceid, ULONG id, void *info);
    46 extern int GetUniaudControlValueGet(ULONG deviceid, ULONG id, void *value);
    47 extern int GetUniaudControlValuePut(ULONG deviceid, ULONG id, void *value);
    48 extern int GetNumberOfPcm(int card_id);
    49 extern int GetUniaudPcmCaps(ULONG deviceid, void *caps);
    50 extern int SetPCMInstance(int card_id, int pcm);
    51 extern int WaitForControlChange(int card_id, int timeout);
    52 extern int GetNumberOfCards(void);
    53 extern OSSRET OSS32_WaveOpen(ULONG deviceid, ULONG streamtype, OSSSTREAMID *pStreamId, int pcm, USHORT fileid);
    54 extern OSSRET OSS32_WaveClose(OSSSTREAMID streamid);
    55 extern int UniaudIoctlHWRefine(OSSSTREAMID streamid, void *pHwParams);
    56 extern int UniaudIoctlHWParamSet(OSSSTREAMID streamid, void *pHwParams);
    57 extern int UniaudIoctlSWParamSet(OSSSTREAMID streamid, void *pSwParams);
    58 extern int UniaudIoctlPCMStatus(OSSSTREAMID streamid, void *pstatus);
    59 extern int UniaudIoctlPCMWrite(OSSSTREAMID streamid, char *buf, int size);
    60 extern int UniaudIoctlPCMRead(OSSSTREAMID streamid, char *buf, int size);
    61 extern int UniaudIoctlPCMPrepare(OSSSTREAMID streamid);
    62 extern int UniaudIoctlPCMStart(OSSSTREAMID streamid);
    63 extern int UniaudIoctlPCMDrop(OSSSTREAMID streamid);
    64 extern int UniaudIoctlPCMResume(OSSSTREAMID streamid, int pause);
    65 extern void UniaudCloseAll(USHORT fileid);
    66 extern int WaitForPCMInterrupt(void *file, int timeout);
    67 extern int unlock_all;
    68 extern int OSS32_CloseUNI16(void);
    69 extern int UniaudCtlGetPowerState(ULONG deviceid, void *state);
    70 extern int UniaudCtlSetPowerState(ULONG deviceid, void *state);
     34#include <u32ioctl.h>
     35#include "strategy.h"
    7136
    7237typedef UCHAR LOCKHANDLE[12];
    … …  
    8752ULONG StratIOCtl(REQPACKET __far* rp)
    8853{
    89     USHORT rc = 0;;
     54    USHORT rc = 0;
    9055    LOCKHANDLE lhParm, lhData;
    9156    LINEAR linParm, linData;
    … …  
    588553    return (rc);
    589554}
    590 
    591 //******************************************************************************
    592 // Dispatch Close requests received from the strategy routine
    593 //******************************************************************************
    594 ULONG StratClose(REQPACKET __far* rp)
    595 {
    596   // only called if device successfully opened
    597   //  printk("strat close\n");
    598   numOS2Opens--;
    599 
    600   UniaudCloseAll(rp->open_close.usSysFileNum);
    601 
    602   if (numOS2Opens == 0) {
    603           deviceOwner = DEV_NO_OWNER;
    604   }
    605   return(RPDONE);
    606 }
    607 

  • TabularUnified GPL/branches/uniaud32-next/drv32/idc.c

    r591 r675  
    2828#include <os2.h>
    2929//DAZ }
    30 #include <devtype.h>
    3130#include <devhelp.h>
    32 //#include <strategy.h>
    3331#include <ossidc32.h>
    3432#include <irqos2.h>
    35 #include <stacktoflat.h>
    3633#include <dbgos2.h>
    3734
    … …  
    3936IDC16_HANDLER idc16_PddHandler = 0;
    4037extern int pcm_device;
    41 WORD32 OSS32IDC(ULONG cmd, PIDC32_PACKET pPacket);
     38OSSRET OSS32IDC(ULONG cmd, PIDC32_PACKET pPacket);
    4239
    4340//packet pointer must reference a structure on the stack

  • TabularUnified GPL/branches/uniaud32-next/drv32/init.c

    r667 r675  
    3030// Device support
    3131#include <devhelp.h>
    32 #include <devtype.h>
    33 //DAZ #include <devrp.h>
    34 #include <strategy.h>
    35 #include "devown.h"
    3632#include <version.h>
    3733#include <ossidc32.h>
    3834#include <dbgos2.h>
    39 #include <irqos2.h>
    4035#include <osspci.h>
    4136#include <kee.h>
     37#include <malloc.h>
    4238#include "parse.h"
    43 #include "malloc.h"
    4439#include "sound/version.h"
     40#include "strategy.h"
    4541
    4642const char ERR_ERROR[]   = "ERROR: ";
    … …  
    228224    WriteString(debugmsg, strlen(debugmsg));
    229225  }
    230 
    231   //get the current time (to force retrieval of GIS pointer)
    232   os2gettimemsec();
    233226
    234227  char szMixerName[64];

  • TabularUnified GPL/branches/uniaud32-next/drv32/irq.c

    r604 r675  
    2626#include <os2.h>
    2727
    28 #include <devtype.h>
    29 #include <devinfo.h>
    3028#include <devhelp.h>
    3129#include <include.h>            // Defn's for WatCom based drivers.

  • TabularUnified GPL/branches/uniaud32-next/drv32/parse.c

    r607 r675  
    3333
    3434#include <devhelp.h>
    35 #include <devtype.h>
    36 #include <unicard.h>
     35#include <string.h>
    3736#include "parse.h"         // NUM_DEVICES
    38 #include <string.h>
    3937
    4038#define COMM_DEBUG

  • TabularUnified GPL/branches/uniaud32-next/drv32/read.c

    r587 r675  
    11#define INCL_NOPMAPI
    22#include <os2.h>
    3 #include <devhelp.h>
    4 #include <strategy.h>
    53#include <dbgos2.h>
    64#include <string.h> // memcpy
     5#include "strategy.h"
    76
    87int   rdOffset= 0;

  • TabularUnified GPL/branches/uniaud32-next/drv32/rmhelp.c

    r656 r675  
    1414
    1515#include <devhelp.h>
    16 #include <devinfo.h>
    17 
    18 #include <rmbase.h>             // Resource manager definitions.
    19 #include "rmcalls.h"
    20 #include <rmioctl.h>
    21 
    2216#include <version.h>
    2317#include <dbgos2.h>
    24 #include <unicard.h>
    2518#include <osspci.h>
    2619#include <ossidc32.h>
     20#include <string.h>
     21#include "rmbase.h"             // Resource manager definitions.
     22#include "rmcalls.h"
    2723#include "pciids.h"
    28 
    29 #include <string.h>
    3024
    3125#define MAX_RESHANDLES  16

  • TabularUnified GPL/branches/uniaud32-next/drv32/strategy.c

    r591 r675  
    2929
    3030#include <devhelp.h>
    31 //DAZ #include <devrp.h>
    32 #include <devown.h>
    33 #include "strategy.h"
    3431#include <ossidc32.h>
    3532#include <dbgos2.h>
    3633#include <string.h>
     34#include <u32ioctl.h>
     35#include "devown.h"
     36#include "strategy.h"
    3737
    3838ULONG StratRead(REQPACKET __far *_rp);
    3939ULONG StratIOCtl(REQPACKET __far *_rp);
    40 ULONG StratClose(REQPACKET __far *_rp);
    4140
    4241ULONG DiscardableInit(REQPACKET __far*);
    … …  
    5453  }
    5554  numOS2Opens++;
     55  return RPDONE;
     56}
     57
     58//******************************************************************************
     59ULONG StratClose(REQPACKET __far* rp)
     60{
     61  // only called if device successfully opened
     62  //  printk("strat close\n");
     63  numOS2Opens--;
     64
     65  UniaudCloseAll(rp->open_close.usSysFileNum);
     66
     67  if (numOS2Opens == 0)
     68  {
     69    deviceOwner = DEV_NO_OWNER;
     70  }
    5671  return RPDONE;
    5772}

  • TabularUnified GPL/branches/uniaud32-next/include/irqos2.h

    r545 r675  
    6060
    6161BOOL process_interrupt(ULONG ulSlotNo, ULONG *pulIrq);
    62 void PciAdjustInterrupts(void);
    63 ULONG os2gettimemsec();
    64 ULONG os2gettimesec();
    6562
    6663#ifdef __cplusplus

  • TabularUnified GPL/branches/uniaud32-next/lib32/Makefile

    r667 r675  
    66!include $(ROOT)\tools\header.mif
    77
     8# note: Watcom headers must be before DDK headers to avoid conflicts
     9# with C runtime headers
     10%INCLUDE = $(%INCLUDE)$(DDK)\base\h;
    811AINCLUDES = $(DDK)\base\H
    912

  • TabularUnified GPL/branches/uniaud32-next/lib32/ioctl.c

    r644 r675  
    2121#include "soundoss.h"
    2222
     23#include <u32ioctl.h>
     24
    2325POSS32_DEVCAPS pcmcaps[8] = {0,0,0,0,0,0,0,0};
    2426extern int pcm_device;
    … …  
    3436int card_id_changed = 0;
    3537int unlock_all = 0;
    36 int GetUniaudPcmCaps(ULONG deviceid, void *caps);
    37 void FillCaps(ULONG deviceid);
    3838int pcm_instances(int card_id);
    3939
    … …  
    180180}
    181181
     182/*
    182183int GetPcmForChannels(ULONG deviceid, int type, int channels)
    183184{
    … …  
    220221        return sel_pcm;
    221222}
     223*/
    222224
    223225int GetMaxChannels(ULONG deviceid, int type)
    … …  
    262264 returns pcm caps
    263265 */
    264 int GetUniaudPcmCaps1(ULONG deviceid, void *caps)
     266static int GetUniaudPcmCaps1(ULONG deviceid, void *caps)
    265267{
    266268        POSS32_DEVCAPS pcaps = (POSS32_DEVCAPS)caps;

  • TabularUnified GPL/branches/uniaud32-next/lib32/ossidc.c

    r667 r675  
    3333#include <version.h>
    3434#include "initcall.h"
     35#include <u32ioctl.h>
    3536
    3637extern DWORD TimerHandler16;    //drv32\strategy.asm
    … …  
    9596int        fStrategyInit = FALSE;
    9697void pcm_info(void);
    97 void FillCaps(ULONG deviceid);
    9898
    9999//******************************************************************************

  • TabularUnified GPL/branches/uniaud32-next/lib32/sound.c

    r672 r675  
    3737#include <stdlib.h>
    3838#include <proto.h>
    39 //#include <dbgos2.h>
     39#include <u32ioctl.h>
    4040#include "soundoss.h"
    4141
    … …  
    4444#define samples_to_bytes(a)     ((a*pHandle->doublesamplesize)/2)
    4545#define bytes_to_samples(a)    (pHandle->doublesamplesize ? ((a*2)/pHandle->doublesamplesize) : a)
    46 int GetMaxChannels(ULONG deviceid, int type);
    4746
    4847struct file_operations oss_devices[OSS32_MAX_DEVICES] = {0};

  • TabularUnified GPL/branches/uniaud32-next/lib32/timer.c

    r629 r675  
    3838#include <dbgos2.h>
    3939
     40#pragma pack(1)
     41#include     "infoseg.h"
     42#pragma pack()
     43extern PVOID  KernSISData;
     44#define KernSISData             ((struct InfoSegGDT *)&KernSISData)
     45
    4046static   long          jiffiems    = 1000/HZ;
    4147static   long          lasttime    = 0;
    … …  
    4955    long delta, newtime, remainder;
    5056
    51     newtime    = os2gettimemsec();
     57    newtime    = KernSISData->SIS_MsCount;
    5258    delta      = newtime - lasttime;
    5359
    … …  
    97103{
    98104#if 0
    99     tv->tv_sec  = 0; //os2gettimesec();
    100     tv->tv_usec = os2gettimemsec() * 1000;
     105    tv->tv_sec  = 0; //KernSISData->SIS_BigTime;
     106    tv->tv_usec = KernSISData->SIS_MsCount * 1000;
    101107#else /* r.ihle patch */
    102     unsigned u = os2gettimemsec();
     108    unsigned u = KernSISData->SIS_MsCount;
    103109    tv->tv_sec  = u / 1000;
    104110    tv->tv_usec = (u % 1000) * 1000;
Note: See TracChangeset for help on using the changeset viewer.