ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/BasiliskII/src/main.cpp
(Generate patch)

Comparing BasiliskII/src/main.cpp (file contents):
Revision 1.3 by cebix, 1999-10-25T08:07:45Z vs.
Revision 1.6 by cebix, 2001-01-04T19:50:22Z

# Line 1 | Line 1
1   /*
2   *  main.cpp - Startup/shutdown code
3   *
4 < *  Basilisk II (C) 1997-1999 Christian Bauer
4 > *  Basilisk II (C) 1997-2000 Christian Bauer
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 79 | Line 79 | bool InitAll(void)
79                          TwentyFourBitAddressing = true;
80                          break;
81                  case ROM_VERSION_II:
82 <                        CPUType = 2;
82 >                        CPUType = PrefsFindInt32("cpu");
83 >                        if (CPUType < 2) CPUType = 2;
84 >                        if (CPUType > 4) CPUType = 4;
85                          FPUType = PrefsFindBool("fpu") ? 1 : 0;
86 +                        if (CPUType == 4) FPUType = 1;  // 68040 always with FPU
87                          TwentyFourBitAddressing = true;
88                          break;
89                  case ROM_VERSION_32:
90 <                        CPUType = 3;
90 >                        CPUType = PrefsFindInt32("cpu");
91 >                        if (CPUType < 2) CPUType = 2;
92 >                        if (CPUType > 4) CPUType = 4;
93                          FPUType = PrefsFindBool("fpu") ? 1 : 0;
94 +                        if (CPUType == 4) FPUType = 1;  // 68040 always with FPU
95                          TwentyFourBitAddressing = false;
96                          break;
97          }
# Line 96 | Line 102 | bool InitAll(void)
102          XPRAMInit();
103  
104          // Set boot volume
105 <        int16 i16 = PrefsFindInt16("bootdrive");
105 >        int16 i16 = PrefsFindInt32("bootdrive");
106          XPRAM[0x78] = i16 >> 8;
107          XPRAM[0x79] = i16 & 0xff;
108 <        i16 = PrefsFindInt16("bootdriver");
108 >        i16 = PrefsFindInt32("bootdriver");
109          XPRAM[0x7a] = i16 >> 8;
110          XPRAM[0x7b] = i16 & 0xff;
111  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines