Changeset 220

Timestamp:

Jul 17, 2007, 5:58:46 PM (18 years ago)

Author:

Brendan Oakley

Message:

Tag of updates from Vlad

Location:

OCO/tags/1.1.4RC2

Files:

• . (copied) (copied from OCO/trunk )
• drv16/apm.asm (modified) (2 diffs)
• drv16/apmevent.cpp (modified) (5 diffs)
• drv16/init.cpp (modified) (3 diffs)
• drv16/ossidc16.cpp (modified) (2 diffs)
• drv16/strategy.cpp (modified) (2 diffs)
• drv16/waudio.cpp (modified) (2 diffs)
• drv16/waudio.hpp (modified) (1 diff)
• drv16/wavehw.hpp (modified) (1 diff)
• drv16/waveplay.cpp (modified) (9 diffs)
• include/ossidc.h (modified) (1 diff)
• include/version.h (modified) (1 diff)

OCO/tags/1.1.4RC2/drv16/apm.asm

@@ -77 +77 @@
 
         enter  4,0
-        pushad
+;        pushad
         push    ds
         push    es
@@ -92 +92 @@
         pop     es
         pop     ds
-        popad
+;        popad
         leave
         ret  4

OCO/tags/1.1.4RC2/drv16/apmevent.cpp

@@ -17 +17 @@
 #endif
 
-static int fAPMSuspend = FALSE;
+int fAPMSuspend = FALSE;
 
 /***********************************************************************/
@@ -49 +49 @@
         return(APM_suspend(APM_STATE_OFF));     /* put chip to sleep */
       default:
-        return 1;
+        return 0;
     } /* endswitch */
 
@@ -65 +65 @@
     return 0;
   }
-  return 1;
+  return 0;
 }
 
@@ -132 +132 @@
 }
 
+/* just external callback */
+void far apm_resume(void)
+{
+    APM_resume(APM_STATE_READY);
+}
 
 /***********************************************************************/
@@ -152 +157 @@
         APM_Reg_Req.function = APM_REGISTER_FUNCTION;
         APM_Reg_Req.eventh = APM_EVENT;
-        APM_Reg_Req.mask = 0x3C0;
+        APM_Reg_Req.mask = 0xFFF8;
         APM_Reg_Req.ds = FP_SEG(&APM_Reg_Req);
         APM_Reg_Req.device_id = 0x0001;

OCO/tags/1.1.4RC2/drv16/init.cpp

@@ -64 +64 @@
 static char szCopyRight1[]= "Copyright 2000-2002 InnoTek Systemberatung GmbH";
 static char szCopyRight2[]= "Copyright 2002 IBM Corporation";
-static char szCopyRight3[]= "Maintained by http://os2.kiev.ua/en/uniaud.php";
+static char szCopyRight3[]= "Maintained by http://uniaud.netlabs.org";
 static char szParamError[]= "Parameter parsing error!!";
 static char szInitError[] = "Unable to initialize audio hardware";
@@ -167 +167 @@
     if(DosOpen((PSZ)"ALSA32$", &hFile, &usAction, 0,
                FILE_NORMAL, FILE_OPEN, OPEN_ACCESS_READWRITE |
-               OPEN_SHARE_DENYNONE | OPEN_FLAGS_WRITE_THROUGH,
+               OPEN_SHARE_DENYNONE | OPEN_FLAGS_WRITE_THROUGH
+               /* Rudi's suggestion */ | OPEN_FLAGS_NOINHERIT,
                NULL ) == NO_ERROR)
     {
@@ -190 +191 @@
     current_device = 0;
     // Build the Wave Playback Hardware object
-    new WAVEPLAY(current_device);
+    pWavePlay = new WAVEPLAY(current_device);
     new WAVEREC(current_device);
 

OCO/tags/1.1.4RC2/drv16/ossidc16.cpp

@@ -41 +41 @@
 
 extern "C" ULONG  far __cdecl OSSIDC_ENTRY(ULONG cmd, ULONG param1, ULONG param2);
-
+extern int force_closed;
 //Used to call into the 32 bits OSS driver
 static OSSRET CallOSS32(USHORT cmd, IDC32_PACKET FAR *pIDCPacket);
@@ -666 +666 @@
         break;
 
-    case IDC16_CLOSE_PCM:
-//        force_close();
-        break;
+    case IDC16_CLOSE_UNI16:
+        {
+            force_closed = 1;
+            pWavePlay->Close(0);
+            //WAVEAUDIO::WavePlayClose();
+            break;
+        }
     case IDC16_PROCESS:
     {
         PWAVESTREAM pStream;
-
-
 //            dprintf(("IDC16_PROCESS. param1: %x, param2: %x",param1, param2));
         //Signal all active wave playback streams to update their status

OCO/tags/1.1.4RC2/drv16/strategy.cpp

@@ -169 +169 @@
        goto failure;
    }
+   dprintf(("Device 0 name: %s", (char FAR *)devCaps[0].szDeviceName));
    if(devCaps[0].nrDevices > OSS32_MAX_AUDIOCARDS)
    {
@@ -183 +184 @@
    }
 
+   /* skip sertifying crap */
+
+   return TRUE;
    //Check for certified audiocard/chipsets
    if(!xorstrncmp(devCaps[0].szDeviceName, pszIntelICH, 6) ||

OCO/tags/1.1.4RC2/drv16/waudio.cpp

@@ -434 +434 @@
     //manual sample rate conversion before sending buffers to the ALSA driver
     FindMatchingSampleRate(pConfigInfo->ulSampleRate, pWaveCaps->ulRateFlags, &ulNrSampleRates, &pConfigInfo->ulFixedSampleRate);
-    if(ulNrSampleRates == 1 && pConfigInfo->ulSampleRate != pConfigInfo->ulFixedSampleRate) {
+    if(ulNrSampleRates <= 2 && pConfigInfo->ulSampleRate != pConfigInfo->ulFixedSampleRate) {
         pConfigInfo->fSampleRateConversion = TRUE;
     }
@@ -1015 +1015 @@
         sampleRates[nrSampleRates++] = 192000;
     }
-    if(nrSampleRates > 1) {
+    if(nrSampleRates > 2) {
         _usfind_matching_sample_rate(&ulSampleRate, nrSampleRates, (ULONG FAR *)sampleRates);
     }
     else {
         //fixed rate -> we support all sample rates by manually performing sample rate conversion
-        if(nrSampleRates == 1 && pulFixedSampleRate) {
-            *pulFixedSampleRate = sampleRates[0];
+        if(nrSampleRates <= 2 && pulFixedSampleRate) {
+            sampleRates[0] = 48000; /* hardware set to 48000 */
+            *pulFixedSampleRate = sampleRates[0]; 
+            nrSampleRates = 1;
         }
     }

OCO/tags/1.1.4RC2/drv16/waudio.hpp

@@ -145 +145 @@
    virtual BOOL  Close(OSSSTREAMID StreamId) = 0;
 
-          ULONG  ConvertLength(ULONG length, PWAVECONFIGINFO pConfigInfo);
-          ULONG  ConvertLengthInvert(ULONG length, PWAVECONFIGINFO pConfigInfo);
-          ULONG  ConvertPosition(ULONG length, PWAVECONFIGINFO pConfigInfo);
-          ULONG  ConvertPositionInvert(ULONG length, PWAVECONFIGINFO pConfigInfo);
+   ULONG  ConvertLength(ULONG length, PWAVECONFIGINFO pConfigInfo);
+   ULONG  ConvertLengthInvert(ULONG length, PWAVECONFIGINFO pConfigInfo);
+   ULONG  ConvertPosition(ULONG length, PWAVECONFIGINFO pConfigInfo);
+   ULONG  ConvertPositionInvert(ULONG length, PWAVECONFIGINFO pConfigInfo);
 
 protected:
 
-   ULONG         ulDeviceNr;
-   OSSSTREAMID   StreamId;
+    OSSSTREAMID   StreamId;
+    ULONG         ulDeviceNr;
 
 private:

OCO/tags/1.1.4RC2/drv16/wavehw.hpp

@@ -53 +53 @@
 typedef WAVEPLAY *PWAVEPLAY;
 
+PWAVEPLAY pWavePlay = NULL;
+
 class WAVEREC : public WAVEAUDIO {
 public:

OCO/tags/1.1.4RC2/drv16/waveplay.cpp

@@ -40 +40 @@
 
 int waveOpened = 0;
-
+int force_closed = 0;
+extern int fAPMSuspend;
+void far apm_resume(void);
 extern "C"
 {
@@ -47 +49 @@
 }
 
+/*
+ * save already opened by mmos2
+ * to reuse in case of reopen stream needed
+ * TODO!! if there is more right way?
+ */
+ULONG ulDeviceSave, ulStreamTypeSave, ulSysFileNumSave;
 //******************************************************************************
 //******************************************************************************
@@ -55 +63 @@
     dprintf(("WAVEPLAY::Open %lx",StreamId));
 #endif
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Open. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
     if(StreamId == 0UL)
     {
@@ -73 +90 @@
         //if the device supports multiple active streams, then we always open
         //a new ALSA stream
-        if(devCaps[ulDevice].waveOutCaps.nrStreams == 1) {
+        //if(devCaps[ulDevice].waveOutCaps.nrStreams == 1) {
             StreamId = *pStreamId;
-        }
+        //}
+        ulDeviceSave = ulDevice;
+        ulStreamTypeSave = ulStreamType;
+        ulSysFileNumSave = ulSysFileNum;
     }
     else {
@@ -85 +105 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WAVEPLAY::Close(OSSSTREAMID StreamId)
+BOOL WAVEPLAY::Close(OSSSTREAMID StreamIdl)
 {
 #ifdef DEBUG
@@ -92 +112 @@
     //if ((open_strategy & 1))
     //if (waveOpened == 1)
-    if (0)
-    {
-        if (OSS16_WaveClose(StreamId) == OSSERR_SUCCESS)
+    if (force_closed)
+    {
+        waveOpened--;
+        StreamId = 0UL;
+        open_strategy = 0UL;
+        force_closed = 0;
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
+#endif
+        return TRUE;
+    }
+    else
+    {
+        //if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
+        if (0)
         {
-            waveOpened--;
-            StreamId = 0UL;
-            open_strategy = 0UL;
-#ifdef DEBUG
-            dprintf(("WAVEPLAY::Closed stream: %lx, %lx, os: %lx\n", StreamId, waveOpened,open_strategy));
-#endif
-            return TRUE;
-        }
-        return FALSE;
-    }
-    else
-    {
-        if(devCaps[ulDeviceNr].waveOutCaps.nrStreams > 1)
-        {
-            if (OSS16_WaveClose(StreamId) == OSSERR_SUCCESS)
+            if (OSS16_WaveClose(StreamIdl) == OSSERR_SUCCESS)
             {
                 waveOpened--;
@@ -137 +155 @@
 #endif
 
-//    if (!waveOpened) return TRUE;
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::ConfigDev. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
+    if (StreamId == NULL)
+    {
+        WAVEPLAY::Open(ulDeviceSave, ulStreamTypeSave, ulSysFileNumSave, &StreamId);
+        if (StreamId == NULL)
+        {
+#ifdef DEBUG
+            dprintf(("WAVEPLAY::ConfigDev. Error reopening stream"));
+#endif
+            return FALSE;
+        }
+    }
 #ifdef DEBUG
     dprintf(("WAVEPLAY::ConfigDev1 SampleRate %d", pConfigInfo->ulHwSampleRate));
@@ -228 +265 @@
 //    dprintf(("WAVEPLAY::Transfer"));
 #endif
+
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::Transfer. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
 
 //    if (!waveOpened) return TRUE;
@@ -281 +327 @@
 //    if (!waveOpened) return TRUE;
 
+    if (fAPMSuspend)
+    {
+#ifdef DEBUG
+        dprintf(("WAVEPLAY::AddBuffer. Suspend state"));
+#endif
+        apm_resume();
+        //return FALSE;
+    }
+
     if(pConfigInfo->fSampleRateConversion)
     {

OCO/tags/1.1.4RC2/include/ossidc.h

@@ -162 +162 @@
 #define IDC16_WAVEOUT_IRQ               1
 #define IDC16_MIDI_IRQ                  2
-#define IDC16_CLOSE_PCM                 3
+#define IDC16_CLOSE_UNI16               3
 
 // Default device nr (first detected audio device)

OCO/tags/1.1.4RC2/include/version.h

@@ -10 +10 @@
 #define __VERSION_H__
 
-#define ALSA_VERSION            "1.1.2"
+#define ALSA_VERSION            "1.1.4RC2"
 
 #endif //__VERSION_H__