X-Git-Url: http://v3vee.org/palacios/gitweb/gitweb.cgi?p=palacios.git;a=blobdiff_plain;f=palacios%2Fsrc%2Fdevices%2Fgeneric.c;h=35d8b9a8850cd61697e4709130253ea400ee8437;hp=40b6c008d9e3b8d4750beabeb5cb0f61ddcf5d2d;hb=a4b341afa075a6620dd087ee3a8ed850730c05c7;hpb=645c766b13d15fd70cd360e577eac1f62e07149f

diff --git a/palacios/src/devices/generic.c b/palacios/src/devices/generic.c
index 40b6c00..35d8b9a 100644
--- a/palacios/src/devices/generic.c
+++ b/palacios/src/devices/generic.c
@@ -69,13 +69,17 @@ int generic_write_port(ushort_t port,
   uint_t i;
 
   GENERIC_DEBUG_PRINT("generic: writing 0x");
-  for (i=0;i<length;i++) { 
-    GENERIC_DEBUG_PRINT("%x",((uchar_t*)src)[i]);
+
+  for (i = 0; i < length; i++) { 
+    GENERIC_DEBUG_PRINT("%x", ((uchar_t*)src)[i]);
   }
-  GENERIC_DEBUG_PRINT(" to port 0x%x ... ",port);
-  for (i=0;i<length;i++) { 
-    Out_Byte(port,((uchar_t*)src)[i]);
+
+  GENERIC_DEBUG_PRINT(" to port 0x%x ... ", port);
+
+  for (i = 0; i < length; i++) { 
+    Out_Byte(port, ((uchar_t*)src)[i]);
   }
+
   GENERIC_DEBUG_PRINT(" done\n");
   
   return length;
@@ -88,14 +92,18 @@ int generic_read_port(ushort_t port,
 {
   uint_t i;
 
-  GENERIC_DEBUG_PRINT("generic: reading 0x%x bytes from port 0x%x ...",length,port);
-  for (i=0;i<length;i++) { 
-    ((uchar_t*)src)[i] =In_Byte(port);
+  GENERIC_DEBUG_PRINT("generic: reading 0x%x bytes from port 0x%x ...", length, port);
+
+  for (i = 0; i < length; i++) { 
+    ((uchar_t*)src)[i] = In_Byte(port);
   }
+
   GENERIC_DEBUG_PRINT(" done ... read 0x");
-  for (i=0;i<length;i++) { 
-    GENERIC_DEBUG_PRINT("%x",((uchar_t*)src)[i]);
+
+  for (i = 0; i < length; i++) { 
+    GENERIC_DEBUG_PRINT("%x", ((uchar_t*)src)[i]);
   }
+
   GENERIC_DEBUG_PRINT("\n");
 
   return length;
@@ -106,9 +114,9 @@ int generic_read_port(ushort_t port,
 int generic_interrupt(uint_t irq,
 		      struct vm_device * dev) 
 {
-  PrintDebug("generic: interrupt 0x%x - injecting into VM\n",irq);
+  PrintDebug("generic: interrupt 0x%x - injecting into VM\n", irq);
 
-  dev->vm->vm_ops.raise_irq(dev->vm,irq);
+  dev->vm->vm_ops.raise_irq(dev->vm, irq);
 
   return 0;
 
@@ -117,8 +125,8 @@ int generic_interrupt(uint_t irq,
 
 int generic_init_device(struct vm_device * dev) 
 {
-  struct generic_internal *state = (struct generic_internal *) dev->private_data;
-  uint_t i,j;
+  struct generic_internal *state = (struct generic_internal *)(dev->private_data);
+  uint_t i, j;
 
   GENERIC_DEBUG_PRINT("generic: init_device\n");
 
@@ -126,12 +134,13 @@ int generic_init_device(struct vm_device * dev)
 
   generic_reset_device(dev);
 
-  for (i=0;i<state->num_port_ranges;i++) { 
-    GENERIC_DEBUG_PRINT("generic: hooking ports 0x%x to 0x%x\n",state->port_ranges[i][0],state->port_ranges[i][1]);
+  for (i = 0; i < state->num_port_ranges; i++) { 
+    GENERIC_DEBUG_PRINT("generic: hooking ports 0x%x to 0x%x\n", state->port_ranges[i][0], state->port_ranges[i][1]);
+
 #if PORT_HOOKS
-    for (j=state->port_ranges[i][0]; j<=state->port_ranges[i][1];j++) { 
+    for (j = state->port_ranges[i][0]; j <= state->port_ranges[i][1]; j++) { 
       if (dev_hook_io(dev, j, &generic_read_port, &generic_write_port)) { 
-	GENERIC_DEBUG_PRINT("generic: can't hook port 0x%x (already hooked?)\n",j);
+	GENERIC_DEBUG_PRINT("generic: can't hook port 0x%x (already hooked?)\n", j);
       }
     }
 #else
@@ -140,12 +149,13 @@ int generic_init_device(struct vm_device * dev)
 
   }
 
-  for (i=0;i<state->num_address_ranges;i++) { 
+  for (i = 0; i < state->num_address_ranges; i++) { 
     GENERIC_DEBUG_PRINT("generic: hooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); 
+
 #if MEM_HOOKS
-    if (dev_hook_mem(dev, state->address_ranges[i][0],state->address_ranges[i][1])) {
+    if (dev_hook_mem(dev, state->address_ranges[i][0], state->address_ranges[i][1])) {
       GENERIC_DEBUG_PRINT("generic: Can't hook addresses 0x%x to 0x%x (already hooked?)\n",
-		  state->address_ranges[i][0],state->address_ranges[i][1]); 
+		  state->address_ranges[i][0], state->address_ranges[i][1]); 
     }
 #else
     GENERIC_DEBUG_PRINT("generic: hooking addresses not supported\n");
@@ -153,17 +163,19 @@ int generic_init_device(struct vm_device * dev)
 
   }
 
-  for (i=0;i<state->num_irq_ranges;i++) { 
+  for (i = 0; i < state->num_irq_ranges; i++) { 
     GENERIC_DEBUG_PRINT("generic: hooking irqs 0x%x to 0x%x\n",state->irq_ranges[i][0],state->irq_ranges[i][1]);
+
 #if IRQ_HOOKS
-    for (j=state->irq_ranges[i][0]; j<=state->irq_ranges[i][1];j++) { 
-      if (dev_hook_irq(dev, j,  &generic_interrupt)) { 
-	GENERIC_DEBUG_PRINT("generic: can't hook irq  0x%x (already hooked?)\n",j);
+    for (j = state->irq_ranges[i][0]; j <= state->irq_ranges[i][1]; j++) { 
+      if (dev_hook_irq(dev, j, &generic_interrupt)) { 
+	GENERIC_DEBUG_PRINT("generic: can't hook irq  0x%x (already hooked?)\n", j);
       }
     }
 #else
     GENERIC_DEBUG_PRINT("generic: hooking irqs not supported\n");
 #endif
+
   }
 
   return 0;
@@ -171,15 +183,16 @@ int generic_init_device(struct vm_device * dev)
 
 int generic_deinit_device(struct vm_device *dev)
 {
-  struct generic_internal *state = (struct generic_internal *) dev->private_data;
-  uint_t i,j;
+  struct generic_internal *state = (struct generic_internal *)(dev->private_data);
+  uint_t i, j;
 
   GENERIC_DEBUG_PRINT("generic: deinit_device\n");
 
-  for (i=0;i<state->num_irq_ranges;i++) { 
-    GENERIC_DEBUG_PRINT("generic: unhooking irqs 0x%x to 0x%x\n",state->irq_ranges[i][0],state->irq_ranges[i][1]);
+  for (i = 0; i < state->num_irq_ranges; i++) { 
+    GENERIC_DEBUG_PRINT("generic: unhooking irqs 0x%x to 0x%x\n", state->irq_ranges[i][0], state->irq_ranges[i][1]);
+
 #if IRQ_HOOKS
-    for (j=state->irq_ranges[i][0]; j<=state->irq_ranges[i][1];j++) { 
+    for (j = state->irq_ranges[i][0]; j <= state->irq_ranges[i][1]; j++) { 
       if (dev_unhook_irq(dev, j)) {
 	GENERIC_DEBUG_PRINT("generic: can't unhook irq 0x%x (already unhooked?)\n",j);
       }
@@ -190,24 +203,27 @@ int generic_deinit_device(struct vm_device *dev)
 
   }
 
-  for (i=0;i<state->num_address_ranges;i++) { 
+  for (i = 0; i < state->num_address_ranges; i++) { 
     GENERIC_DEBUG_PRINT("generic: unhooking addresses 0x%x to 0x%x\n",state->address_ranges[i][0],state->address_ranges[i][1]); 
+
 #if MEM_HOOKS
-    if (dev_unhook_mem(dev, state->address_ranges[i][0],state->address_ranges[i][1])) {
+    if (dev_unhook_mem(dev, state->address_ranges[i][0], state->address_ranges[i][1])) {
       GENERIC_DEBUG_PRINT("generic: Can't unhook addresses 0x%x to 0x%x (already unhooked?)\n",
-		  state->address_ranges[i][0],state->address_ranges[i][1]); 
+		  state->address_ranges[i][0], state->address_ranges[i][1]); 
     }
 #else
     GENERIC_DEBUG_PRINT("generic: unhooking addresses not supported\n");
 #endif
+
   }
 
-  for (i=0;i<state->num_port_ranges;i++) { 
+  for (i = 0; i < state->num_port_ranges; i++) { 
     GENERIC_DEBUG_PRINT("generic: unhooking ports 0x%x to 0x%x\n",state->port_ranges[i][0],state->port_ranges[i][1]);
+
 #if PORT_HOOKS
-    for (j=state->port_ranges[i][0]; j<=state->port_ranges[i][1];j++) { 
+    for (j = state->port_ranges[i][0]; j <= state->port_ranges[i][1]; j++) { 
       if (dev_unhook_io(dev, j)) {
-	GENERIC_DEBUG_PRINT("generic: can't unhook port 0x%x (already unhooked?)\n",j);
+	GENERIC_DEBUG_PRINT("generic: can't unhook port 0x%x (already unhooked?)\n", j);
       }
     }
 #else
@@ -245,27 +261,33 @@ struct vm_device *create_generic(generic_port_range_type    port_ranges[],
   struct generic_internal * generic_state = (struct generic_internal *)V3_Malloc(sizeof(struct generic_internal));
 
 
-  generic_state->num_port_ranges=num_port_ranges;
-  if (num_port_ranges>0) { 
-    generic_state->port_ranges = V3_Malloc(sizeof(generic_address_range_type)*num_port_ranges);
-    memcpy(generic_state->port_ranges,port_ranges,sizeof(generic_port_range_type)*num_port_ranges);
+  generic_state->num_port_ranges = num_port_ranges;
+
+  if (num_port_ranges > 0) { 
+    generic_state->port_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_port_ranges);
+    memcpy(generic_state->port_ranges, port_ranges, sizeof(generic_port_range_type) * num_port_ranges);
   } else {
-    generic_state->port_ranges=NULL;
+    generic_state->port_ranges = NULL;
   }
 
-  generic_state->num_address_ranges=num_address_ranges;
-  if (num_address_ranges>0) { 
-    generic_state->address_ranges = V3_Malloc(sizeof(generic_address_range_type)*num_address_ranges);
-    memcpy(generic_state->address_ranges,address_ranges,sizeof(generic_address_range_type)*num_address_ranges);
+
+  generic_state->num_address_ranges = num_address_ranges;
+
+  if (num_address_ranges > 0) { 
+    generic_state->address_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_address_ranges);
+    memcpy(generic_state->address_ranges, address_ranges, sizeof(generic_address_range_type) * num_address_ranges);
   } else {
-    generic_state->address_ranges=NULL;
+    generic_state->address_ranges = NULL;
   }
-  generic_state->num_irq_ranges=num_irq_ranges;
-  if (num_irq_ranges>0) { 
-    generic_state->irq_ranges = V3_Malloc(sizeof(generic_address_range_type)*num_irq_ranges);
-    memcpy(generic_state->irq_ranges,irq_ranges,sizeof(generic_irq_range_type)*num_port_ranges);
+
+
+  generic_state->num_irq_ranges = num_irq_ranges;
+
+  if (num_irq_ranges > 0) { 
+    generic_state->irq_ranges = V3_Malloc(sizeof(generic_address_range_type) * num_irq_ranges);
+    memcpy(generic_state->irq_ranges, irq_ranges, sizeof(generic_irq_range_type) * num_port_ranges);
   } else {
-    generic_state->irq_ranges=NULL;
+    generic_state->irq_ranges = NULL;
   }