Style cleanup.

1 files changed, 81 insertions, 64 deletions

diff --git a/sys/dev/bktr/bktr_mem.c b/sys/dev/bktr/bktr_mem.c
index 7ebd50d..278e6b8 100644
--- a/sys/dev/bktr/bktr_mem.c
+++ b/sys/dev/bktr/bktr_mem.c
@@ -1,5 +1,3 @@
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 /*
  * This is part of the Driver for Video Capture Cards (Frame grabbers)
  * and TV Tuner cards using the Brooktree Bt848, Bt848A, Bt849A, Bt878, Bt879
@@ -45,6 +43,8 @@ __FBSDID("$FreeBSD$");
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -53,12 +53,12 @@ __FBSDID("$FreeBSD$");
 #include <dev/bktr/bktr_mem.h>
 
 struct memory_pointers {
-	int         addresses_stored;
-	vm_offset_t dma_prog;
-	vm_offset_t odd_dma_prog;
-	vm_offset_t vbidata;
-	vm_offset_t vbibuffer;
-	vm_offset_t buf;
+	int		addresses_stored;
+	vm_offset_t	dma_prog;
+	vm_offset_t	odd_dma_prog;
+	vm_offset_t	vbidata;
+	vm_offset_t	vbibuffer;
+	vm_offset_t	buf;
 } memory_pointers;
 
 static struct memory_pointers memory_list[BKTR_MEM_MAX_DEVICES];
@@ -70,39 +70,37 @@ bktr_mem_modevent(module_t mod, int type, void *unused){
 
 	switch (type) {
 	case MOD_LOAD:
-		{
 		printf("bktr_mem: memory holder loaded\n");
-/*
- * bzero causes a panic.
-		bzero((caddr_t)memory_list, sizeof(memory_list));
- * So use a simple for loop for now.
-*/
-		{int x;
-		 unsigned char *d = (unsigned char *)memory_list;
-		 for (x=0; x< sizeof(memory_list); x++) {
-		  d[x]=0;
-		 }
+		/*
+		 * bzero((caddr_t)memory_list, sizeof(memory_list));
+		 * causes a panic. So use a simple for loop for now.
+		 */
+		{
+			int x;
+			unsigned char *d;
+
+			d = (unsigned char *)memory_list;
+			for (x = 0; x < sizeof(memory_list); x++)
+				d[x] = 0;
 		}
 		return 0;
-		}
 	case MOD_UNLOAD:
-		{
 		printf("bktr_mem: memory holder cannot be unloaded\n");
 		return EBUSY;
-		}
 	default:
 		break;
 	}
-	return 0;
+	return (0);
 }
 
 /*************************************************************/
 
 int
-bktr_has_stored_addresses(int unit) {
+bktr_has_stored_addresses(int unit)
+{
 
-	if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) {
-		printf("bktr_mem: Unit number %d invalid\n",unit);
+	if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) {
+		printf("bktr_mem: Unit number %d invalid\n", unit);
 		return 0;
 	}
 
@@ -112,64 +110,83 @@ bktr_has_stored_addresses(int unit) {
 /*************************************************************/
 
 void
-bktr_store_address(int unit, int type, vm_offset_t addr) {
+bktr_store_address(int unit, int type, vm_offset_t addr)
+{
 
-	if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) {
-		printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n"
-		       ,unit,type,addr);
+	if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) {
+		printf("bktr_mem: Unit number %d invalid for memory type %d, address 0x%x\n",
+		       unit, type, addr);
 		return;
 	}
 
 	switch (type) {
-		case BKTR_MEM_DMA_PROG:     memory_list[unit].dma_prog = addr;
-		                            memory_list[unit].addresses_stored = 1;
-		                            break;
-		case BKTR_MEM_ODD_DMA_PROG: memory_list[unit].odd_dma_prog = addr;
-		                            memory_list[unit].addresses_stored = 1;
-		                            break;
-		case BKTR_MEM_VBIDATA:      memory_list[unit].vbidata = addr;
-		                            memory_list[unit].addresses_stored = 1;
-		                            break;
-		case BKTR_MEM_VBIBUFFER:    memory_list[unit].vbibuffer = addr;
-		                            memory_list[unit].addresses_stored = 1;
-		                            break;
-		case BKTR_MEM_BUF:          memory_list[unit].buf = addr;
-		                            memory_list[unit].addresses_stored = 1;
-		                            break;
-		default:                    printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn",
-				                   type,unit,addr);
-		                            break;
+	case BKTR_MEM_DMA_PROG:
+		memory_list[unit].dma_prog = addr;
+		memory_list[unit].addresses_stored = 1;
+		break;
+	case BKTR_MEM_ODD_DMA_PROG:
+		memory_list[unit].odd_dma_prog = addr;
+		memory_list[unit].addresses_stored = 1;
+		break;
+	case BKTR_MEM_VBIDATA:
+		memory_list[unit].vbidata = addr;
+		memory_list[unit].addresses_stored = 1;
+		break;
+	case BKTR_MEM_VBIBUFFER:
+		memory_list[unit].vbibuffer = addr;
+		memory_list[unit].addresses_stored = 1;
+		break;
+	case BKTR_MEM_BUF:
+		memory_list[unit].buf = addr;
+		memory_list[unit].addresses_stored = 1;
+		break;
+	default:
+		printf("bktr_mem: Invalid memory type %d for bktr%d, address 0x%xn",
+			type, unit, addr);
+		break;
 	}
 }
 
 /*************************************************************/
 
 vm_offset_t
-bktr_retrieve_address(int unit, int type) {
+bktr_retrieve_address(int unit, int type)
+{
 
-	if ((unit < 0) || (unit >= BKTR_MEM_MAX_DEVICES)) {
-		printf("bktr_mem: Unit number %d too large for memory type %d\n",unit,type);
-		return 0;
+	if (unit < 0 || unit >= BKTR_MEM_MAX_DEVICES) {
+		printf("bktr_mem: Unit number %d too large for memory type %d\n",
+			unit, type);
+		return (0);
 	}
 	switch (type) {
-		case BKTR_MEM_DMA_PROG:     return memory_list[unit].dma_prog;
-		case BKTR_MEM_ODD_DMA_PROG: return memory_list[unit].odd_dma_prog;
-		case BKTR_MEM_VBIDATA:      return memory_list[unit].vbidata;
-		case BKTR_MEM_VBIBUFFER:    return memory_list[unit].vbibuffer;
-		case BKTR_MEM_BUF:          return memory_list[unit].buf;
-		default:                    printf("bktr_mem: Invalid memory type %d for bktr%d",type,unit);
-		                            return 0;
+	case BKTR_MEM_DMA_PROG:
+		return memory_list[unit].dma_prog;
+	case BKTR_MEM_ODD_DMA_PROG:
+		return memory_list[unit].odd_dma_prog;
+	case BKTR_MEM_VBIDATA:
+		return memory_list[unit].vbidata;
+	case BKTR_MEM_VBIBUFFER:
+		return memory_list[unit].vbibuffer;
+	case BKTR_MEM_BUF:
+		return memory_list[unit].buf;
+	default:
+		printf("bktr_mem: Invalid memory type %d for bktr%d",
+		       type, unit);
+		return (0);
 	}
 }
 
 /*************************************************************/
 
 static moduledata_t bktr_mem_mod = {
-        "bktr_mem",
-        bktr_mem_modevent,
-        0
+	"bktr_mem",
+	bktr_mem_modevent,
+	0
 };
-/* The load order is First and module type is Driver to make sure bktr_mem
-   loads (and initialises) before bktr when both are loaded together */
+
+/*
+ * The load order is First and module type is Driver to make sure bktr_mem
+ * loads (and initialises) before bktr when both are loaded together.
+ */
 DECLARE_MODULE(bktr_mem, bktr_mem_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST);
 MODULE_VERSION(bktr_mem, 1);