From: Ben Gras <ben@minix3.org>
Date: Tue, 20 Jun 2006 09:52:11 +0000 (+0000)
Subject: Rename protected to prot for g++
X-Git-Tag: v3.1.3~320
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/index.html?a=commitdiff_plain;h=eecb40cf21a21848720af91d6ca077c855458642;p=minix.git

Rename protected to prot for g++
---

diff --git a/kernel/i8259.c b/kernel/i8259.c
index c832bd9cb..0e487656e 100755
--- a/kernel/i8259.c
+++ b/kernel/i8259.c
@@ -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.)
diff --git a/kernel/protect.c b/kernel/protect.c
index 5f5324d61..a4c2e7693 100755
--- a/kernel/protect.c
+++ b/kernel/protect.c
@@ -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)
diff --git a/kernel/start.c b/kernel/start.c
index b77e0342f..1fbad7991 100755
--- a/kernel/start.c
+++ b/kernel/start.c
@@ -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");