porting and tweaking sd more i added a cuted code file and a xxdiff friendlyer versio...

[16.git] / src / lib / id_sd.c

diff --git a/src/lib/id_sd.c b/src/lib/id_sd.c
index 8bd50e5914919023edb66144d19127f1de95ebb5..943dede1093f35034ae12af43622597ae39e953a 100755 (executable)
--- a/src/lib/id_sd.c
+++ b/src/lib/id_sd.c
@@ -82,9 +82,7 @@
                void    SDL_IndicatePC(boolean on);\r
 \r
 //     Global variables\r
-       boolean         SoundSourcePresent,\r
-                               AdLibPresent,\r
-                               SoundBlasterPresent,SBProPresent,\r
+       boolean         AdLibPresent,\r
                                NeedsDigitized,NeedsMusic,\r
                                SoundPositioned;\r
        SDMode          SoundMode;\r
@@ -94,7 +92,6 @@
        word            HackCount;\r
        word            *SoundTable;    // Really * _seg *SoundTable, but that don't work\r
        boolean         ssIsTandy;\r
-       word            ssPort = 2;\r
        int                     DigiMap[LASTSOUND];\r
 \r
 //     Internal variables\r
@@ -106,13 +103,6 @@ static     boolean                 SD_Started;
 static char                    *ParmStrings[] =\r
                                                {\r
                                                        "noal",\r
-                                                       "nosb",\r
-                                                       "nopro",\r
-                                                       "noss",\r
-                                                       "sst",\r
-                                                       "ss1",\r
-                                                       "ss2",\r
-                                                       "ss3",\r
                                                        nil\r
                                                };\r
 static void                    (*SoundUserHook)(void);\r
@@ -132,33 +122,6 @@ static     memptr                  DigiNextAddr;
 static word                    DigiNextLen;\r
                boolean                 pcindicate;\r
 \r
-#if 0\r
-//     SoundBlaster variables\r
-static boolean                                 sbNoCheck,sbNoProCheck;\r
-static volatile boolean                sbSamplePlaying;\r
-static byte                                    sbOldIntMask = -1;\r
-static volatile byte                   huge *sbNextSegPtr;\r
-static byte                                    sbDMA = 1,\r
-                                                               sbDMAa1 = 0x83,sbDMAa2 = 2,sbDMAa3 = 3,\r
-                                                               sba1Vals[] = {0x87,0x83,0,0x82},\r
-                                                               sba2Vals[] = {0,2,0,6},\r
-                                                               sba3Vals[] = {1,3,0,7};\r
-static int                                             sbLocation = -1,sbInterrupt = 7,sbIntVec = 0xf,\r
-                                                               sbIntVectors[] = {-1,-1,0xa,0xb,-1,0xd,-1,0xf,-1,-1,-1};\r
-static volatile dword          sbNextSegLen;\r
-static volatile SampledSound   huge *sbSamples;\r
-static void interrupt                  (*sbOldIntHand)(void);\r
-static byte                                    sbpOldFMMix,sbpOldVOCMix;\r
-\r
-//     SoundSource variables\r
-               boolean                         ssNoCheck;\r
-               boolean                         ssActive;\r
-               word                            ssControl,ssStatus,ssData;\r
-               byte                            ssOn,ssOff;\r
-               volatile byte           far *ssSample;\r
-               volatile dword  ssLengthLeft;\r
-#endif\r
-\r
 //     PC Sound variables\r
                volatile byte   pcLastSample,far *pcSound;\r
                dword           pcLengthLeft;\r