oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename protected to prot for g++

Browse Source
This commit is contained in:
Ben Gras 2006-06-20 09:52:11 +00:00
parent 28950e6104
commit eecb40cf21
3 changed files with 7 additions and 7 deletions
Show Stats 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(); intr_disable();
if (machine.protected) { if (machine.prot) {
/* The AT and newer PS/2 have two interrupt controllers, one master, /* 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 * 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.) * has just one controller, because it must run in real mode.)

6
kernel/protect.c
View File

@ -263,7 +263,7 @@ U16_t seg;
phys_bytes base; phys_bytes base;
struct segdesc_s *segdp; struct segdesc_s *segdp;
if (! machine.protected) { if (! machine.prot) {
base = hclick_to_physb(seg); base = hclick_to_physb(seg);
} else { } else {
segdp = &gdt[seg >> 3]; 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. * address, for use by a driver doing memory I/O in the A0000 - DFFFF range.
*/ */
#if _WORD_SIZE == 2 #if _WORD_SIZE == 2
if (! machine.protected) { if (! machine.prot) {
*seg = phys / HCLICK_SIZE; *seg = phys / HCLICK_SIZE;
*off = phys % HCLICK_SIZE; *off = phys % HCLICK_SIZE;
} else { } else {
@ -350,7 +350,7 @@ register struct proc *rp;
phys_bytes data_bytes; phys_bytes data_bytes;
int privilege; int privilege;
if (machine.protected) { if (machine.prot) {
data_bytes = (phys_bytes) (rp->p_memmap[S].mem_vir + data_bytes = (phys_bytes) (rp->p_memmap[S].mem_vir +
rp->p_memmap[S].mem_len) << CLICK_SHIFT; rp->p_memmap[S].mem_len) << CLICK_SHIFT;
if (rp->p_memmap[T].mem_len == 0) 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. * done below.
*/ */
#if _WORD_SIZE != 2 #if _WORD_SIZE != 2
machine.protected = 1; machine.prot = 1;
#endif #endif
/* Record where the kernel and the monitor are. */ /* 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")); machine.processor=atoi(get_value(params, "processor"));
#if _WORD_SIZE == 2 #if _WORD_SIZE == 2
machine.protected = machine.processor >= 286; machine.prot = machine.processor >= 286;
#endif #endif
if (! machine.protected) mon_return = 0; if (! machine.prot) mon_return = 0;
/* XT, AT or MCA bus? */ /* XT, AT or MCA bus? */
value = get_value(params, "bus"); value = get_value(params, "bus");