Deleted Added
full compact
machdep.c (5837) machdep.c (5908)
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
1/*-
2 * Copyright (c) 1992 Terrence R. Lambert.
3 * Copyright (c) 1982, 1987, 1990 The Regents of the University of California.
4 * All rights reserved.
5 *
6 * This code is derived from software contributed to Berkeley by
7 * William Jolitz.
8 *

--- 21 unchanged lines hidden (view full) ---

30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 *
37 * from: @(#)machdep.c 7.4 (Berkeley) 6/3/91
38 * $Id: machdep.c,v 1.102 1995/01/17 01:15:12 bde Exp $
38 * $Id: machdep.c,v 1.103 1995/01/24 09:56:29 davidg Exp $
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/signalvar.h>

--- 307 unchanged lines hidden (view full) ---

354
355 /*
356 * Configure the system.
357 */
358 configure();
359 if (bootverbose) {
360 printf("BIOS Geometries:");
361 for (i=0; i < N_BIOS_GEOM; i++)
39 */
40
41#include "npx.h"
42#include "isa.h"
43
44#include <sys/param.h>
45#include <sys/systm.h>
46#include <sys/signalvar.h>

--- 307 unchanged lines hidden (view full) ---

354
355 /*
356 * Configure the system.
357 */
358 configure();
359 if (bootverbose) {
360 printf("BIOS Geometries:");
361 for (i=0; i < N_BIOS_GEOM; i++)
362 printf(" %x:%x\n", i, bootinfo.bios_geom[i]);
363 printf(" %d accounted for\n",bootinfo.n_bios_used);
362 printf(" %x:%x\n", i, bootinfo.bi_bios_geom[i]);
363 printf(" %d accounted for\n", bootinfo.bi_n_bios_used);
364 }
365}
366
367
368struct cpu_nameclass i386_cpus[] = {
369 { "Intel 80286", CPUCLASS_286 }, /* CPU_286 */
370 { "i386SX", CPUCLASS_386 }, /* CPU_386SX */
371 { "i386DX", CPUCLASS_386 }, /* CPU_386 */

--- 858 unchanged lines hidden (view full) ---

1230
1231 /* Use BIOS values stored in RTC CMOS RAM, since probing
1232 * breaks certain 386 AT relics.
1233 */
1234 biosbasemem = rtcin(RTC_BASELO)+ (rtcin(RTC_BASEHI)<<8);
1235 biosextmem = rtcin(RTC_EXTLO)+ (rtcin(RTC_EXTHI)<<8);
1236
1237 /*
364 }
365}
366
367
368struct cpu_nameclass i386_cpus[] = {
369 { "Intel 80286", CPUCLASS_286 }, /* CPU_286 */
370 { "i386SX", CPUCLASS_386 }, /* CPU_386SX */
371 { "i386DX", CPUCLASS_386 }, /* CPU_386 */

--- 858 unchanged lines hidden (view full) ---

1230
1231 /* Use BIOS values stored in RTC CMOS RAM, since probing
1232 * breaks certain 386 AT relics.
1233 */
1234 biosbasemem = rtcin(RTC_BASELO)+ (rtcin(RTC_BASEHI)<<8);
1235 biosextmem = rtcin(RTC_EXTLO)+ (rtcin(RTC_EXTHI)<<8);
1236
1237 /*
1238 * Print a warning if the official BIOS interface disagrees
1239 * with the hackish interface used above. Eventually only
1240 * the official interface should be used.
1241 */
1242 if (bootinfo.bi_memsizes_valid) {
1243 if (bootinfo.bi_basemem != biosbasemem)
1244 printf("BIOS basemem (%dK) != RTC basemem (%dK)\n",
1245 bootinfo.bi_basemem, biosbasemem);
1246 if (bootinfo.bi_extmem != biosextmem)
1247 printf("BIOS extmem (%dK) != RTC extmem (%dK)\n",
1248 bootinfo.bi_extmem, biosextmem);
1249 }
1250
1251 /*
1238 * If BIOS tells us that it has more than 640k in the basemem,
1239 * don't believe it - set it to 640k.
1240 */
1241 if (biosbasemem > 640)
1242 biosbasemem = 640;
1243
1244 /*
1245 * Some 386 machines might give us a bogus number for extended

--- 396 unchanged lines hidden ---
1252 * If BIOS tells us that it has more than 640k in the basemem,
1253 * don't believe it - set it to 640k.
1254 */
1255 if (biosbasemem > 640)
1256 biosbasemem = 640;
1257
1258 /*
1259 * Some 386 machines might give us a bogus number for extended

--- 396 unchanged lines hidden ---