From: Jack Lange <jarusl@cs.northwestern.edu>
Date: Tue, 16 Sep 2008 22:09:27 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: 1.0~30
X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=commitdiff_plain;h=c06353fc5bed0f246bca54eff9294ab33c2fd860

*** empty log message ***
---

diff --git a/palacios/src/devices/8259a.c b/palacios/src/devices/8259a.c
index 186aace..1217646 100644
--- a/palacios/src/devices/8259a.c
+++ b/palacios/src/devices/8259a.c
@@ -6,7 +6,6 @@
 #ifndef DEBUG_PIC
 #undef PrintDebug
 #define PrintDebug(fmt, args...)
-//#define PrintPicTrace(_f, _a...) PrintTrace("\n8259a.c(%d) "_f, __LINE__, ## _a)
 #endif
 
 
diff --git a/palacios/src/devices/nvram.c b/palacios/src/devices/nvram.c
index 8df8b79..f16cbd7 100644
--- a/palacios/src/devices/nvram.c
+++ b/palacios/src/devices/nvram.c
@@ -112,40 +112,42 @@ struct rtc_statd {
 
 
 
-struct vm_device *thedev=NULL;
+struct vm_device * thedev = NULL;
 
-
-static struct vm_device *demultiplex_timer_interrupt(uint_t period_us)
+static struct vm_device * demultiplex_timer_interrupt(uint_t period_us)
 {
   // hack
   return thedev;
 }
 
 struct bcd_num {
-  uchar_t bot:4;
-  uchar_t top:4;
+  uchar_t bot : 4;
+  uchar_t top : 4;
 } ;
 
-static uchar_t add_to(uchar_t *left, uchar_t *right, uchar_t bcd)
+static uchar_t add_to(uchar_t * left, uchar_t * right, uchar_t bcd)
 {
   uchar_t temp;
 
   if (bcd) { 
-    struct bcd_num *bl = (struct bcd_num *)left;
-    struct bcd_num *br = (struct bcd_num *)right;
-    uchar_t carry=0;
+    struct bcd_num * bl = (struct bcd_num *)left;
+    struct bcd_num * br = (struct bcd_num *)right;
+    uchar_t carry = 0;
 
     bl->bot += br->bot;
     carry = bl->bot / 0xa;
     bl->bot %= 0xa;
+
     bl->top += carry + br->top;
     carry = bl->top / 0xa;
     bl->top %= 0xa;
+
     return carry;
   } else {
-    temp=*left;
-    *left+=*right;
-    if (*left<temp) { 
+    temp = *left;
+    *left += *right;
+
+    if (*left < temp) { 
       return 1;
     } else {
       return 0;
@@ -160,78 +162,83 @@ static uchar_t days_in_month(struct vm_device *dev, uchar_t month, uchar_t bcd)
   // This completely ignores Julian / Gregorian stuff right now
 
   if (bcd) { 
-    switch (month) {
-    case 0x1: //jan
-    case 0x3: //march
-    case 0x5: //may
-    case 0x7: //july
-    case 0x8: //aug
-    case 0x10: //oct
-    case 0x12: //dec
-      return 0x31;
-      break;
-    case 0x4: //april
-    case 0x6: //june
-    case 0x9: //sept
-    case 0x11: //nov
-      return 0x30;
-      break;
-    case 0x2: //feb
-      return 0x28;
-      break;
-    default:
-      return 0x30;
-    }
+
+    switch (month) 
+      {
+      case 0x1: //jan
+      case 0x3: //march
+      case 0x5: //may
+      case 0x7: //july
+      case 0x8: //aug
+      case 0x10: //oct
+      case 0x12: //dec
+	return 0x31;
+	break;
+      case 0x4: //april
+      case 0x6: //june
+      case 0x9: //sept
+      case 0x11: //nov
+	return 0x30;
+	break;
+      case 0x2: //feb
+	return 0x28;
+	break;
+      default:
+	return 0x30;
+      }
+    
   } else {
-    switch (month) {
-    case 1: //jan
-    case 3: //march
-    case 5: //may
-    case 7: //july
-    case 8: //aug
-    case 10: //oct
-    case 12: //dec
-      return 31;
-      break;
-    case 4: //april
-    case 6: //june
-    case 9: //sept
-    case 11: //nov
-      return 30;
-      break;
-    case 2: //feb
-      return 28;
-      break;
-    default:
-      return 30;
-    }
+
+    switch (month) 
+      {
+      case 1: //jan
+      case 3: //march
+      case 5: //may
+      case 7: //july
+      case 8: //aug
+      case 10: //oct
+      case 12: //dec
+	return 31;
+	break;
+      case 4: //april
+      case 6: //june
+      case 9: //sept
+      case 11: //nov
+	return 30;
+	break;
+      case 2: //feb
+	return 28;
+	break;
+      default:
+	return 30;
+      }
   }
 }
 
 
 static void update_time(struct vm_device *dev, uint_t period_us)
 {
-  struct nvram_internal *data = (struct nvram_internal *) (dev->private_data);
-  struct rtc_stata *stata = (struct rtc_stata *) &((data->mem_state[NVRAM_REG_STAT_A]));
-  struct rtc_statb *statb = (struct rtc_statb *) &((data->mem_state[NVRAM_REG_STAT_B]));
-  struct rtc_statc *statc = (struct rtc_statc *) &((data->mem_state[NVRAM_REG_STAT_C]));
+  struct nvram_internal * data = (struct nvram_internal *) (dev->private_data);
+  struct rtc_stata * stata = (struct rtc_stata *) &((data->mem_state[NVRAM_REG_STAT_A]));
+  struct rtc_statb * statb = (struct rtc_statb *) &((data->mem_state[NVRAM_REG_STAT_B]));
+  struct rtc_statc * statc = (struct rtc_statc *) &((data->mem_state[NVRAM_REG_STAT_C]));
   //struct rtc_statd *statd = (struct rtc_statd *) &((data->mem_state[NVRAM_REG_STAT_D]));
-  uchar_t *sec = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC]);
-  uchar_t *min = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN]);
-  uchar_t *hour = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR]);
-  uchar_t *weekday = (uchar_t *) &(data->mem_state[NVRAM_REG_WEEK_DAY]);
-  uchar_t *monthday = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH_DAY]);
-  uchar_t *month = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH]);
-  uchar_t *year = (uchar_t *) &(data->mem_state[NVRAM_REG_YEAR]);
-  uchar_t *cent = (uchar_t *) &(data->mem_state[NVRAM_REG_IBM_CENTURY_BYTE]);
-  uchar_t *seca = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC_ALARM]);
-  uchar_t *mina = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN_ALARM]);
-  uchar_t *houra = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR_ALARM]);
+  uchar_t * sec = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC]);
+  uchar_t * min = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN]);
+  uchar_t * hour = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR]);
+  uchar_t * weekday = (uchar_t *) &(data->mem_state[NVRAM_REG_WEEK_DAY]);
+  uchar_t * monthday = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH_DAY]);
+  uchar_t * month = (uchar_t *) &(data->mem_state[NVRAM_REG_MONTH]);
+  uchar_t * year = (uchar_t *) &(data->mem_state[NVRAM_REG_YEAR]);
+  uchar_t * cent = (uchar_t *) &(data->mem_state[NVRAM_REG_IBM_CENTURY_BYTE]);
+  uchar_t * seca = (uchar_t *) &(data->mem_state[NVRAM_REG_SEC_ALARM]);
+  uchar_t * mina = (uchar_t *) &(data->mem_state[NVRAM_REG_MIN_ALARM]);
+  uchar_t * houra = (uchar_t *) &(data->mem_state[NVRAM_REG_HOUR_ALARM]);
   uchar_t hour24;
 
-  uchar_t bcd = (statb->dm==1);
-  uchar_t carry=0;
-  uchar_t nextday=0;
+  uchar_t bcd = (statb->dm == 1);
+  uchar_t carry = 0;
+  uchar_t nextday = 0;
   uint_t  periodic_period;
 
   //PrintDebug("nvram: sizeof(struct rtc_stata)=%d\n", sizeof(struct rtc_stata));
@@ -240,7 +247,10 @@ static void update_time(struct vm_device *dev, uint_t period_us)
   //PrintDebug("nvram: update_time\n",statb->pi);
   
   // We will set these flags on exit
-  statc->irq=statc->pf=statc->af=statc->uf=0;
+  statc->irq = 0;
+  statc->pf = 0;
+  statc->af = 0;
+  statc->uf = 0;
 
   // We will reset us after one second
   data->us += period_us;
@@ -248,106 +258,141 @@ static void update_time(struct vm_device *dev, uint_t period_us)
   data->pus += period_us;
 
   if (data->us > 1000000) { 
-    carry=1;
-    //PrintDebug("nvram: adding 1 to seconds=0x%x (bcd=%d)...", *sec, bcd);
-    carry=add_to(sec,&carry,bcd);
-    //PrintDebug("got 0x%x with carry=%d\n",*sec,carry);
-    if (carry) { PrintDebug("nvram: somehow managed to get a carry in second update\n"); }
-    if ((bcd && *sec==0x60) || (!bcd && *sec==60)) { 
-      *sec=0;
-      carry=1;
-      carry=add_to(min,&carry,bcd);
-      if (carry) { PrintDebug("nvram: somehow managed to get a carry in minute update\n"); }
-      if ((bcd && *min==0x60) || (!bcd && *min==60)) { 
-	*min=0;
+    carry = 1;
+    carry = add_to(sec, &carry, bcd);
+
+    if (carry) { 
+      PrintDebug("nvram: somehow managed to get a carry in second update\n"); 
+    }
+
+    if ( (bcd && (*sec == 0x60)) || 
+	 ((!bcd) && (*sec == 60))) { 
+  
+      *sec = 0;
+
+      carry = 1;
+      carry = add_to(min, &carry, bcd);
+      if (carry) { 
+	PrintDebug("nvram: somehow managed to get a carry in minute update\n"); 
+      }
+
+      if ( (bcd && (*min == 0x60)) || 
+	   ((!bcd) && (*min == 60))) { 
+
+	*min = 0;
 	hour24 = *hour;
+
 	if (!(statb->h24)) { 
-	  if (hour24&0x80) { 
-	    hour24&=0x8f;
-	    uchar_t temp = bcd ? 0x12 : 12;
-	    add_to(&hour24,&temp, bcd);
+
+	  if (hour24 & 0x80) { 
+	    hour24 &= 0x8f;
+	    uchar_t temp = ((bcd) ? 0x12 : 12);
+	    add_to(&hour24, &temp, bcd);
 	  }
 	}
-	carry=1;
-	carry=add_to(&hour24,&carry,bcd);
-	if (carry) { PrintDebug("nvram: somehow managed to get a carry in hour update\n"); }
-	if ((bcd && hour24==0x24) || (!bcd && hour24==24)) { 
-	  carry=1;
-	  nextday=1;
-	  hour24=0;
+
+	carry = 1;
+	carry = add_to(&hour24, &carry, bcd);
+	if (carry) { 
+	  PrintDebug("nvram: somehow managed to get a carry in hour update\n"); 
+	}
+
+	if ( (bcd && (hour24 == 0x24)) || 
+	     ((!bcd) && (hour24 == 24))) { 
+	  carry = 1;
+	  nextday = 1;
+	  hour24 = 0;
 	} else {
-	  carry=0;
+	  carry = 0;
 	}
+
+
 	if (statb->h24) { 
-	  *hour=hour24;
+	  *hour = hour24;
 	} else {
-	  if ((bcd && hour24<0x12) || (!bcd && hour24<12)) { 
-	    *hour=hour24;
+	  if ( (bcd && (hour24 < 0x12)) || 
+	       ((!bcd) && (hour24 < 12))) { 
+	    *hour = hour24;
+
 	  } else {
+
 	    if (!bcd) { 
-	      *hour = (hour24-12) | 0x80;
+	      *hour = (hour24 - 12) | 0x80;
 	    } else {
 	      *hour = hour24;
-	      struct bcd_num *n = (struct bcd_num *) hour;
-	      if (n->bot<0x2) { 
+	      struct bcd_num * n = (struct bcd_num *)hour;
+
+	      if (n->bot < 0x2) { 
 		n->top--;
-		n->bot+=0xa;
+		n->bot += 0xa;
 	      }
-	      n->bot-=0x2;
-	      n->top-=0x1;
+
+	      n->bot -= 0x2;
+	      n->top -= 0x1;
 	    }
 	  }
 	}
+
 	// now see if we need to carry into the days and further
 	if (nextday) { 
-	  carry=1;
+	  carry = 1;
 	  add_to(weekday, &carry, bcd);
-	  *weekday%=0x7;  // same regardless of bcd
-	  if (!(*monthday==days_in_month(dev,*month,bcd))) {
+
+	  *weekday %= 0x7;  // same regardless of bcd
+
+	  if ((*monthday) != days_in_month(dev, *month, bcd)) {
 	    add_to(monthday, &carry, bcd);
 	  } else {
-	    *monthday=0x1;
-	    carry=1;
-	    add_to(month,&carry,bcd);
-	    if ((bcd && *month==0x13) || (!bcd && *month==13)) { 
-	      *month=1; // same for both 
-	      carry=1;
-	      carry=add_to(year,&carry,bcd);
-	      if ((bcd && carry) || (!bcd && *year==100)) { 
-		*year=0;
-		carry=1;
-		add_to(cent,&carry,bcd);
+	    *monthday = 0x1;
+
+	    carry = 1;
+	    add_to(month, &carry, bcd);
+
+	    if ( (bcd && (*month == 0x13)) || 
+		 ((!bcd) && (*month == 13))) { 
+	      *month = 1; // same for both 
+
+	      carry = 1;
+	      carry = add_to(year, &carry, bcd);
+
+	      if ( (bcd && carry) || 
+		   ((!bcd) && (*year == 100))) { 
+		*year = 0;
+		carry = 1;
+		add_to(cent, &carry, bcd);
 	      }
 	    }
 	  }
 	}
       }
     }
-    data->us-=1000000;
+
+
+    data->us -= 1000000;
     // OK, now check for the alarm, if it is set to interrupt
     if (statb->ai) { 
-      if (*sec==*seca && *min==*mina && *hour==*houra) { 
-	statc->af=1;
+      if ((*sec == *seca) && (*min == *mina) && (*hour == *houra)) { 
+	statc->af = 1;
 	PrintDebug("nvram: interrupt on alarm\n");
       }
     }
   }
 
   if (statb->pi) { 
-    periodic_period = 1000000/(65536/(0x1 << stata->rate));
+    periodic_period = 1000000 / (65536 / (0x1 << stata->rate));
     if (data->pus >= periodic_period) { 
-      statc->pf=1;
+      statc->pf = 1;
       data->pus -= periodic_period;
       PrintDebug("nvram: interrupt on periodic\n");
     }
   }
 
   if (statb->ui) { 
-    statc->uf=1;
+    statc->uf = 1;
     PrintDebug("nvram: interrupt on update\n");
   }
 
-  statc->irq= statc->pf || statc->af || statc->uf;
+  statc->irq = (statc->pf || statc->af || statc->uf);
   
   //PrintDebug("nvram: time is now: YMDHMS: 0x%x:0x%x:0x%x:0x%x:0x%x,0x%x bcd=%d\n", *year, *month, *monthday, *hour, *min, *sec,bcd);
   
@@ -363,27 +408,25 @@ static void update_time(struct vm_device *dev, uint_t period_us)
 
 void deliver_timer_interrupt_to_vmm(uint_t period_us)
 {
-  struct vm_device *dev = demultiplex_timer_interrupt(period_us);
+  struct vm_device * dev = demultiplex_timer_interrupt(period_us);
 
   if (dev) {
-    update_time(dev,period_us);
+    update_time(dev, period_us);
   }
   
 }
 
 
-static int set_nvram_defaults(struct vm_device *dev)
+static int set_nvram_defaults(struct vm_device * dev)
 {
-  struct nvram_internal * nvram_state = (struct nvram_internal*) dev->private_data;
-
-
+  struct nvram_internal * nvram_state = (struct nvram_internal *)dev->private_data;
 
 
   //
   // 2 1.44 MB floppy drives
   //
 #if 1
-  nvram_state->mem_state[NVRAM_REG_FLOPPY_TYPE]= 0x44;
+  nvram_state->mem_state[NVRAM_REG_FLOPPY_TYPE] = 0x44;
 #else
   nvram_state->mem_state[NVRAM_REG_FLOPPY_TYPE] = 0x00;
 #endif
@@ -391,30 +434,30 @@ static int set_nvram_defaults(struct vm_device *dev)
   //
   // For old boot sequence style, do floppy first
   //
-  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_OLD]= 0x10;
+  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_OLD] = 0x10;
 
 #if 0
   // For new boot sequence style, do floppy, cd, then hd
-  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_FIRST]= 0x31;
-  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_SECOND]= 0x20;
+  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_FIRST] = 0x31;
+  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_SECOND] = 0x20;
 #endif
 
   // For new boot sequence style, do cd, hd, floppy
-  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_FIRST]= 0x23;
-  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_SECOND]= 0x10;
+  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_FIRST] = 0x23;
+  nvram_state->mem_state[NVRAM_REG_BOOTSEQ_NEW_SECOND] = 0x10;
  
 
   // Set equipment byte to note 2 floppies, vga display, keyboard,math,floppy
-  nvram_state->mem_state[NVRAM_REG_EQUIPMENT_BYTE]= 0x4f;
+  nvram_state->mem_state[NVRAM_REG_EQUIPMENT_BYTE] = 0x4f;
   //nvram_state->mem_state[NVRAM_REG_EQUIPMENT_BYTE] = 0xf;
 
   // Set conventional memory to 640K
-  nvram_state->mem_state[NVRAM_REG_BASE_MEMORY_HIGH]= 0x02;
-  nvram_state->mem_state[NVRAM_REG_BASE_MEMORY_LOW]= 0x80;
+  nvram_state->mem_state[NVRAM_REG_BASE_MEMORY_HIGH] = 0x02;
+  nvram_state->mem_state[NVRAM_REG_BASE_MEMORY_LOW] = 0x80;
 
   // Set extended memory to 15 MB
-  nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_HIGH]= 0x3C;
-  nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_LOW]= 0x00;
+  nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_HIGH] = 0x3C;
+  nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_LOW] = 0x00;
   nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_2ND_HIGH]= 0x3C;
   nvram_state->mem_state[NVRAM_REG_EXT_MEMORY_2ND_LOW]= 0x00;
 
@@ -458,7 +501,8 @@ static int set_nvram_defaults(struct vm_device *dev)
   nvram_state->mem_state[NVRAM_REG_WEEK_DAY] = 0x1;
   nvram_state->mem_state[NVRAM_REG_YEAR] = 0x08;
 
-  nvram_state->us=nvram_state->pus=0;
+  nvram_state->us = 0;
+  nvram_state->pus = 0;
 
   return 0;
 
@@ -467,18 +511,15 @@ static int set_nvram_defaults(struct vm_device *dev)
 
 int nvram_reset_device(struct vm_device * dev)
 {
-  struct nvram_internal *data = (struct nvram_internal *) dev->private_data;
+  struct nvram_internal * data = (struct nvram_internal *) dev->private_data;
   
   PrintDebug("nvram: reset device\n");
 
  
-
   data->dev_state = NVRAM_READY;
-  data->thereg=0;
-
+  data->thereg = 0;
   
   return 0;
-
 }
 
 
@@ -502,11 +543,11 @@ int nvram_stop_device(struct vm_device *dev)
 
 
 int nvram_write_reg_port(ushort_t port,
-			void * src, 
-			uint_t length,
-			struct vm_device * dev)
+			 void * src, 
+			 uint_t length,
+			 struct vm_device * dev)
 {
-  struct nvram_internal *data = (struct nvram_internal *) dev->private_data;
+  struct nvram_internal * data = (struct nvram_internal *)dev->private_data;
 
   memcpy(&(data->thereg), src, 1);
   PrintDebug("Writing To NVRAM reg: 0x%x\n", data->thereg);
@@ -516,11 +557,11 @@ int nvram_write_reg_port(ushort_t port,
 }
 
 int nvram_read_data_port(ushort_t port,
-		       void   * dst, 
-		       uint_t length,
-		       struct vm_device * dev)
+			 void * dst, 
+			 uint_t length,
+			 struct vm_device * dev)
 {
-  struct nvram_internal *data = (struct nvram_internal *) dev->private_data;
+  struct nvram_internal * data = (struct nvram_internal *) dev->private_data;
 
 
 
@@ -529,7 +570,7 @@ int nvram_read_data_port(ushort_t port,
   PrintDebug("nvram_read_data_port(0x%x)=0x%x\n", data->thereg, data->mem_state[data->thereg]);
 
   // hack
-  if (data->thereg==NVRAM_REG_STAT_A) { 
+  if (data->thereg == NVRAM_REG_STAT_A) { 
     data->mem_state[data->thereg] ^= 0x80;  // toggle Update in progess
   }
 
@@ -538,11 +579,11 @@ int nvram_read_data_port(ushort_t port,
 }
 
 int nvram_write_data_port(ushort_t port,
-			void * src, 
-			uint_t length,
-			struct vm_device * dev)
+			  void * src, 
+			  uint_t length,
+			  struct vm_device * dev)
 {
-  struct nvram_internal *data = (struct nvram_internal *) dev->private_data;
+  struct nvram_internal * data = (struct nvram_internal *)dev->private_data;
 
   memcpy(&(data->mem_state[data->thereg]), src, 1);
 
@@ -555,7 +596,7 @@ int nvram_write_data_port(ushort_t port,
 
 int nvram_init_device(struct vm_device * dev) {
  
-  struct nvram_internal *data = (struct nvram_internal *) dev->private_data;
+  struct nvram_internal * data = (struct nvram_internal *) dev->private_data;
 
   PrintDebug("nvram: init_device\n");
 
@@ -599,18 +640,18 @@ static struct vm_device_ops dev_ops = {
 
 
 
-struct vm_device *create_nvram() {
-  struct nvram_internal * nvram_state = (struct nvram_internal *)V3_Malloc(sizeof(struct nvram_internal)+1000);
+struct vm_device * create_nvram() {
+  struct nvram_internal * nvram_state = (struct nvram_internal *)V3_Malloc(sizeof(struct nvram_internal) + 1000);
 
   PrintDebug("nvram: internal at %x\n",nvram_state);
 
-  struct vm_device *device = create_device("NVRAM", &dev_ops, nvram_state);
+  struct vm_device * device = create_device("NVRAM", &dev_ops, nvram_state);
 
-  if (thedev!=NULL) {
+  if (thedev != NULL) {
     PrintDebug("nvram: warning! overwriting thedev\n");
   }
 
-  thedev=device;
+  thedev = device;
 
   return device;
 }