Minix/minix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

This commit was manufactured by cvs2svn to create tag 'r3_1_2a_cds'.

Browse Source
This commit is contained in:
nobody
2006-05-03 22:45:30 +00:00
parent 28290d0898
commit f9e7fa1a87
104 changed files with 26 additions and 45013 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/i8259.c
View File

@@ -49,7 +49,7 @@ int mine;
intr_disable();
if (machine.protected) {
if (machine.prot) {
/* The AT and newer PS/2 have two interrupt controllers, one master,
* one slaved at IRQ 2. (We don't have to deal with the PC that
* has just one controller, because it must run in real mode.)

2
kernel/main.c
View File

@@ -178,7 +178,7 @@ PRIVATE void announce(void)
#if (CHIP == INTEL)
/* Real mode, or 16/32-bit protected mode? */
kprintf("Executing in %s mode.\n\n",
machine.protected ? "32-bit protected" : "real");
machine.prot ? "32-bit protected" : "real");
#endif
}

6
kernel/protect.c
View File

@@ -263,7 +263,7 @@ U16_t seg;
phys_bytes base;
struct segdesc_s *segdp;
if (! machine.protected) {
if (! machine.prot) {
base = hclick_to_physb(seg);
} else {
segdp = &gdt[seg >> 3];
@@ -286,7 +286,7 @@ phys_bytes phys;
* address, for use by a driver doing memory I/O in the A0000 - DFFFF range.
*/
#if _WORD_SIZE == 2
if (! machine.protected) {
if (! machine.prot) {
*seg = phys / HCLICK_SIZE;
*off = phys % HCLICK_SIZE;
} else {
@@ -350,7 +350,7 @@ register struct proc *rp;
phys_bytes data_bytes;
int privilege;
if (machine.protected) {
if (machine.prot) {
data_bytes = (phys_bytes) (rp->p_memmap[S].mem_vir +
rp->p_memmap[S].mem_len) << CLICK_SHIFT;
if (rp->p_memmap[T].mem_len == 0)

6
kernel/start.c
View File

@@ -37,7 +37,7 @@ U16_t parmoff, parmsize; /* boot parameters offset and length */
* done below.
*/
#if _WORD_SIZE != 2
machine.protected = 1;
machine.prot = 1;
#endif
/* Record where the kernel and the monitor are. */
@@ -75,9 +75,9 @@ U16_t parmoff, parmsize; /* boot parameters offset and length */
*/
machine.processor=atoi(get_value(params, "processor"));
#if _WORD_SIZE == 2
machine.protected = machine.processor >= 286;
machine.prot = machine.processor >= 286;
#endif
if (! machine.protected) mon_return = 0;
if (! machine.prot) mon_return = 0;
/* XT, AT or MCA bus? */
value = get_value(params, "bus");

2
kernel/system/do_segctl.c
View File

@@ -44,7 +44,7 @@ register message *m_ptr; /* pointer to request message */
}
if (index < 0) return(ENOSPC);
if (! machine.protected) {
if (! machine.prot) {
selector = phys / HCLICK_SIZE;
offset = phys % HCLICK_SIZE;
result = OK;