Cosmetics and coding style fixes in devices/*.

 - Whitespace and indentation fixes in various places.
 
 - Fix various typos.
 
 - Use u8, u16 etc. everywhere.

Abuild-tested.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5962 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

1 files changed, 48 insertions, 43 deletions

diff --git a/src/devices/cardbus_device.c b/src/devices/cardbus_device.c
index ccd78eb414..e3acf856ec 100644
--- a/src/devices/cardbus_device.c
+++ b/src/devices/cardbus_device.c
@@ -25,28 +25,30 @@
 #include <device/pci_ids.h>
 #include <device/cardbus.h>
 
-/* I don't think this code is quite correct but it is close.
+/*
+ * I don't think this code is quite correct but it is close.
  * Anyone with a cardbus bridge and a little time should be able
  * to make it usable quickly. -- Eric Biederman 24 March 2005
  */
 
 /*
- * IO should be max 256 bytes.  However, since we may
- * have a P2P bridge below a cardbus bridge, we need 4K.
+ * IO should be max 256 bytes. However, since we may have a P2P bridge below
+ * a cardbus bridge, we need 4K.
  */
-#define CARDBUS_IO_SIZE		(4096)
-#define CARDBUS_MEM_SIZE	(32*1024*1024)
+#define CARDBUS_IO_SIZE		4096
+#define CARDBUS_MEM_SIZE	(32 * 1024 * 1024)
 
-static void cardbus_record_bridge_resource(
-	device_t dev, resource_t moving, resource_t min_size,
-	unsigned index, unsigned long type)
+static void cardbus_record_bridge_resource(device_t dev, resource_t moving,
+		resource_t min_size, unsigned int index, unsigned long type)
 {
-	/* Initialize the constraints on the current bus. */
 	struct resource *resource;
+
+	/* Initialize the constraints on the current bus. */
 	resource = NULL;
 	if (moving) {
 		unsigned long gran;
 		resource_t step;
+
 		resource = new_resource(dev, index);
 		resource->size = 0;
 		gran = 0;
@@ -59,30 +61,33 @@ static void cardbus_record_bridge_resource(
 		resource->align = gran;
 		resource->limit = moving | (step - 1);
 		resource->flags = type;
-		/* Don't let the minimum size exceed what we
+
+		/*
+		 * Don't let the minimum size exceed what we
 		 * can put in the resource.
 		 */
-		if ((min_size - 1) > resource->limit) {
+		if ((min_size - 1) > resource->limit)
 			min_size = resource->limit + 1;
-		}
+
 		resource->size = min_size;
 	}
 	return;
 }
 
-static void cardbus_size_bridge_resource(device_t dev, unsigned index)
+static void cardbus_size_bridge_resource(device_t dev, unsigned int index)
 {
 	struct resource *resource;
 	resource_t min_size;
+
 	resource = find_resource(dev, index);
 	if (resource) {
 		min_size = resource->size;
-		/* Allways allocate at least the miniumum size to a
+		/*
+		 * Always allocate at least the miniumum size to a
 		 * cardbus bridge in case a new card is plugged in.
 		 */
-		if (resource->size < min_size) {
+		if (resource->size < min_size)
 			resource->size = min_size;
-		}
 	}
 }
 
@@ -90,34 +95,34 @@ void cardbus_read_resources(device_t dev)
 {
 	resource_t moving_base, moving_limit, moving;
 	unsigned long type;
-	uint16_t ctl;
+	u16 ctl;
 
-	/* See if needs a card control registers base address */
+	/* See if needs a card control registers base address. */
 
 	pci_get_resource(dev, PCI_BASE_ADDRESS_0);
 
 	compact_resources(dev);
 
-	/* See which bridge I/O resources are implemented */
-	moving_base  = pci_moving_config32(dev, PCI_CB_IO_BASE_0);
+	/* See which bridge I/O resources are implemented. */
+	moving_base = pci_moving_config32(dev, PCI_CB_IO_BASE_0);
 	moving_limit = pci_moving_config32(dev, PCI_CB_IO_LIMIT_0);
 	moving = moving_base & moving_limit;
 
-	/* Initialize the io space constraints on the current bus */
+	/* Initialize the I/O space constraints on the current bus. */
 	cardbus_record_bridge_resource(dev, moving, CARDBUS_IO_SIZE,
-		PCI_CB_IO_BASE_0, IORESOURCE_IO);
+				       PCI_CB_IO_BASE_0, IORESOURCE_IO);
 	cardbus_size_bridge_resource(dev, PCI_CB_IO_BASE_0);
 
-	/* See which bridge I/O resources are implemented */
-	moving_base  = pci_moving_config32(dev, PCI_CB_IO_BASE_1);
+	/* See which bridge I/O resources are implemented. */
+	moving_base = pci_moving_config32(dev, PCI_CB_IO_BASE_1);
 	moving_limit = pci_moving_config32(dev, PCI_CB_IO_LIMIT_1);
 	moving = moving_base & moving_limit;
 
-	/* Initialize the io space constraints on the current bus */
+	/* Initialize the I/O space constraints on the current bus. */
 	cardbus_record_bridge_resource(dev, moving, CARDBUS_IO_SIZE,
-		PCI_CB_IO_BASE_1, IORESOURCE_IO);
+				       PCI_CB_IO_BASE_1, IORESOURCE_IO);
 
-	/* If I can enable prefetch for mem0 */
+	/* If I can, enable prefetch for mem0. */
 	ctl = pci_read_config16(dev, PCI_CB_BRIDGE_CONTROL);
 	ctl &= ~PCI_CB_BRIDGE_CTL_PREFETCH_MEM0;
 	ctl &= ~PCI_CB_BRIDGE_CTL_PREFETCH_MEM1;
@@ -125,30 +130,28 @@ void cardbus_read_resources(device_t dev)
 	pci_write_config16(dev, PCI_CB_BRIDGE_CONTROL, ctl);
 	ctl = pci_read_config16(dev, PCI_CB_BRIDGE_CONTROL);
 
-	/* See which bridge memory resources are implemented */
-	moving_base  = pci_moving_config32(dev, PCI_CB_MEMORY_BASE_0);
+	/* See which bridge memory resources are implemented. */
+	moving_base = pci_moving_config32(dev, PCI_CB_MEMORY_BASE_0);
 	moving_limit = pci_moving_config32(dev, PCI_CB_MEMORY_LIMIT_0);
 	moving = moving_base & moving_limit;
 
-	/* Initialize the memory space constraints on the current bus */
+	/* Initialize the memory space constraints on the current bus. */
 	type = IORESOURCE_MEM;
-	if (ctl & PCI_CB_BRIDGE_CTL_PREFETCH_MEM0) {
+	if (ctl & PCI_CB_BRIDGE_CTL_PREFETCH_MEM0)
 		type |= IORESOURCE_PREFETCH;
-	}
 	cardbus_record_bridge_resource(dev, moving, CARDBUS_MEM_SIZE,
-		PCI_CB_MEMORY_BASE_0, type);
-	if (type & IORESOURCE_PREFETCH) {
+				       PCI_CB_MEMORY_BASE_0, type);
+	if (type & IORESOURCE_PREFETCH)
 		cardbus_size_bridge_resource(dev, PCI_CB_MEMORY_BASE_0);
-	}
 
-	/* See which bridge memory resources are implemented */
-	moving_base  = pci_moving_config32(dev, PCI_CB_MEMORY_BASE_1);
+	/* See which bridge memory resources are implemented. */
+	moving_base = pci_moving_config32(dev, PCI_CB_MEMORY_BASE_1);
 	moving_limit = pci_moving_config32(dev, PCI_CB_MEMORY_LIMIT_1);
 	moving = moving_base & moving_limit;
 
-	/* Initialize the memory space constraints on the current bus */
+	/* Initialize the memory space constraints on the current bus. */
 	cardbus_record_bridge_resource(dev, moving, CARDBUS_MEM_SIZE,
-		PCI_CB_MEMORY_BASE_1, IORESOURCE_MEM);
+				       PCI_CB_MEMORY_BASE_1, IORESOURCE_MEM);
 	cardbus_size_bridge_resource(dev, PCI_CB_MEMORY_BASE_1);
 
 	compact_resources(dev);
@@ -156,7 +159,8 @@ void cardbus_read_resources(device_t dev)
 
 void cardbus_enable_resources(device_t dev)
 {
-	uint16_t ctrl;
+	u16 ctrl;
+
 	ctrl = pci_read_config16(dev, PCI_CB_BRIDGE_CONTROL);
 	ctrl |= (dev->link_list->bridge_ctrl & (
 			PCI_BRIDGE_CTL_PARITY |
@@ -165,7 +169,8 @@ void cardbus_enable_resources(device_t dev)
 			PCI_BRIDGE_CTL_VGA |
 			PCI_BRIDGE_CTL_MASTER_ABORT |
 			PCI_BRIDGE_CTL_BUS_RESET));
-	ctrl |= (PCI_CB_BRIDGE_CTL_PARITY + PCI_CB_BRIDGE_CTL_SERR); /* error check */
+	/* Error check */
+	ctrl |= (PCI_CB_BRIDGE_CTL_PARITY + PCI_CB_BRIDGE_CTL_SERR);
 	printk(BIOS_DEBUG, "%s bridge ctrl <- %04x\n", dev_path(dev), ctrl);
 	pci_write_config16(dev, PCI_BRIDGE_CONTROL, ctrl);
 
@@ -176,8 +181,8 @@ struct device_operations default_cardbus_ops_bus = {
 	.read_resources   = cardbus_read_resources,
 	.set_resources    = pci_dev_set_resources,
 	.enable_resources = cardbus_enable_resources,
-	.init			  = 0,
-	.scan_bus		  = pci_scan_bridge,
+	.init             = 0,
+	.scan_bus         = pci_scan_bridge,
 	.enable           = 0,
 	.reset_bus        = pci_bus_reset,
 };