projects
/
seabios.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
grml...
[seabios.git]
/
src
/
cmos.h
diff --git
a/src/cmos.h
b/src/cmos.h
index 3bc4bef3055bc67f77ba00bc4d59a9d6b858eda1..e4b64623316814732daeab07ba1dc2635335ac45 100644
(file)
--- a/
src/cmos.h
+++ b/
src/cmos.h
@@
-2,12
+2,10
@@
//
// Copyright (C) 2008 Kevin O'Connor <kevin@koconnor.net>
//
//
// Copyright (C) 2008 Kevin O'Connor <kevin@koconnor.net>
//
-// This file may be distributed under the terms of the GNU GPLv3 license.
+// This file may be distributed under the terms of the GNU
L
GPLv3 license.
#ifndef __CMOS_H
#define __CMOS_H
#ifndef __CMOS_H
#define __CMOS_H
-#include "ioport.h" // inb, outb
-
#define CMOS_RTC_SECONDS 0x00
#define CMOS_RTC_SECONDS_ALARM 0x01
#define CMOS_RTC_MINUTES 0x02
#define CMOS_RTC_SECONDS 0x00
#define CMOS_RTC_SECONDS_ALARM 0x01
#define CMOS_RTC_MINUTES 0x02
@@
-26,8
+24,6
@@
#define CMOS_FLOPPY_DRIVE_TYPE 0x10
#define CMOS_DISK_DATA 0x12
#define CMOS_EQUIPMENT_INFO 0x14
#define CMOS_FLOPPY_DRIVE_TYPE 0x10
#define CMOS_DISK_DATA 0x12
#define CMOS_EQUIPMENT_INFO 0x14
-#define CMOS_MEM_BASE_LOW 0x17
-#define CMOS_MEM_BASE_HIGH 0x18
#define CMOS_DISK_DRIVE1_TYPE 0x19
#define CMOS_DISK_DRIVE2_TYPE 0x1a
#define CMOS_DISK_DRIVE1_CYL 0x1b
#define CMOS_DISK_DRIVE1_TYPE 0x19
#define CMOS_DISK_DRIVE2_TYPE 0x1a
#define CMOS_DISK_DRIVE1_CYL 0x1b
@@
-40,9
+36,10
@@
#define CMOS_BIOS_BOOTFLAG1 0x38
#define CMOS_BIOS_DISKTRANSFLAG 0x39
#define CMOS_BIOS_BOOTFLAG2 0x3d
#define CMOS_BIOS_BOOTFLAG1 0x38
#define CMOS_BIOS_DISKTRANSFLAG 0x39
#define CMOS_BIOS_BOOTFLAG2 0x3d
-
-// CMOS_STATUS_B bitdefs
-#define CSB_EN_ALARM_IRQ (1<<5)
+#define CMOS_MEM_HIGHMEM_LOW 0x5b
+#define CMOS_MEM_HIGHMEM_MID 0x5c
+#define CMOS_MEM_HIGHMEM_HIGH 0x5d
+#define CMOS_BIOS_SMP_COUNT 0x5f
// CMOS_FLOPPY_DRIVE_TYPE bitdefs
#define CFD_NO_DRIVE 0
// CMOS_FLOPPY_DRIVE_TYPE bitdefs
#define CFD_NO_DRIVE 0
@@
-52,9
+49,14
@@
#define CFD_144MB 4
#define CFD_288MB 5
#define CFD_144MB 4
#define CFD_288MB 5
+#ifndef __ASSEMBLY__
+
+#include "ioport.h" // inb, outb
+
static inline u8
inb_cmos(u8 reg)
{
static inline u8
inb_cmos(u8 reg)
{
+ reg |= NMI_DISABLE_BIT;
outb(reg, PORT_CMOS_INDEX);
return inb(PORT_CMOS_DATA);
}
outb(reg, PORT_CMOS_INDEX);
return inb(PORT_CMOS_DATA);
}
@@
-62,8
+64,11
@@
inb_cmos(u8 reg)
static inline void
outb_cmos(u8 val, u8 reg)
{
static inline void
outb_cmos(u8 val, u8 reg)
{
+ reg |= NMI_DISABLE_BIT;
outb(reg, PORT_CMOS_INDEX);
outb(val, PORT_CMOS_DATA);
}
outb(reg, PORT_CMOS_INDEX);
outb(val, PORT_CMOS_DATA);
}
+#endif // !__ASSEMBLY__
+
#endif // cmos.h
#endif // cmos.h