aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt832.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@brturbo.com.br>2005-11-09 00:37:43 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:20 -0500
commit4ac97914c6c35f6bf132071c718e034d0846b9f5 (patch)
tree98c7eb827bb8ba99730ed89d32703a30448fd813 /drivers/media/video/bt832.c
parenta8900fc242406f25f315190a6d650f1d54617c2f (diff)
[PATCH] v4l: 800: whitespace cleanups
- Whitespace Cleanups. Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/bt832.c')
-rw-r--r--drivers/media/video/bt832.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c
index 76c1b63ebdf2..3e42493a4e0a 100644
--- a/drivers/media/video/bt832.c
+++ b/drivers/media/video/bt832.c
@@ -54,36 +54,36 @@ static struct i2c_driver driver;
54static struct i2c_client client_template; 54static struct i2c_client client_template;
55 55
56struct bt832 { 56struct bt832 {
57 struct i2c_client client; 57 struct i2c_client client;
58}; 58};
59 59
60int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf) 60int bt832_hexdump(struct i2c_client *i2c_client_s, unsigned char *buf)
61{ 61{
62 int i,rc; 62 int i,rc;
63 buf[0]=0x80; // start at register 0 with auto-increment 63 buf[0]=0x80; // start at register 0 with auto-increment
64 if (1 != (rc = i2c_master_send(i2c_client_s,buf,1))) 64 if (1 != (rc = i2c_master_send(i2c_client_s,buf,1)))
65 printk("bt832: i2c i/o error: rc == %d (should be 1)\n",rc); 65 printk("bt832: i2c i/o error: rc == %d (should be 1)\n",rc);
66 66
67 for(i=0;i<65;i++) 67 for(i=0;i<65;i++)
68 buf[i]=0; 68 buf[i]=0;
69 if (65 != (rc=i2c_master_recv(i2c_client_s,buf,65))) 69 if (65 != (rc=i2c_master_recv(i2c_client_s,buf,65)))
70 printk("bt832: i2c i/o error: rc == %d (should be 65)\n",rc); 70 printk("bt832: i2c i/o error: rc == %d (should be 65)\n",rc);
71 71
72 // Note: On READ the first byte is the current index 72 // Note: On READ the first byte is the current index
73 // (e.g. 0x80, what we just wrote) 73 // (e.g. 0x80, what we just wrote)
74 74
75 if(1) { 75 if(1) {
76 int i; 76 int i;
77 printk("BT832 hexdump:\n"); 77 printk("BT832 hexdump:\n");
78 for(i=1;i<65;i++) { 78 for(i=1;i<65;i++) {
79 if(i!=1) { 79 if(i!=1) {
80 if(((i-1)%8)==0) printk(" "); 80 if(((i-1)%8)==0) printk(" ");
81 if(((i-1)%16)==0) printk("\n"); 81 if(((i-1)%16)==0) printk("\n");
82 } 82 }
83 printk(" %02x",buf[i]); 83 printk(" %02x",buf[i]);
84 } 84 }
85 printk("\n"); 85 printk("\n");
86 } 86 }
87 return 0; 87 return 0;
88} 88}
89 89
@@ -102,13 +102,13 @@ int bt832_init(struct i2c_client *i2c_client_s)
102 return 0; 102 return 0;
103 } 103 }
104 104
105 printk("Write 0 tp VPSTATUS\n"); 105 printk("Write 0 tp VPSTATUS\n");
106 buf[0]=BT832_VP_STATUS; // Reg.52 106 buf[0]=BT832_VP_STATUS; // Reg.52
107 buf[1]= 0x00; 107 buf[1]= 0x00;
108 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2))) 108 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
109 printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc); 109 printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
110 110
111 bt832_hexdump(i2c_client_s,buf); 111 bt832_hexdump(i2c_client_s,buf);
112 112
113 113
114 // Leave low power mode: 114 // Leave low power mode:
@@ -116,17 +116,17 @@ int bt832_init(struct i2c_client *i2c_client_s)
116 buf[0]=BT832_CAM_SETUP0; //0x39 57 116 buf[0]=BT832_CAM_SETUP0; //0x39 57
117 buf[1]=0x08; 117 buf[1]=0x08;
118 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2))) 118 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
119 printk("bt832: i2c i/o error LLPM: rc == %d (should be 2)\n",rc); 119 printk("bt832: i2c i/o error LLPM: rc == %d (should be 2)\n",rc);
120 120
121 bt832_hexdump(i2c_client_s,buf); 121 bt832_hexdump(i2c_client_s,buf);
122 122
123 printk("Write 0 tp VPSTATUS\n"); 123 printk("Write 0 tp VPSTATUS\n");
124 buf[0]=BT832_VP_STATUS; // Reg.52 124 buf[0]=BT832_VP_STATUS; // Reg.52
125 buf[1]= 0x00; 125 buf[1]= 0x00;
126 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2))) 126 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
127 printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc); 127 printk("bt832: i2c i/o error VPS: rc == %d (should be 2)\n",rc);
128 128
129 bt832_hexdump(i2c_client_s,buf); 129 bt832_hexdump(i2c_client_s,buf);
130 130
131 131
132 // Enable Output 132 // Enable Output
@@ -134,22 +134,22 @@ int bt832_init(struct i2c_client *i2c_client_s)
134 buf[0]=BT832_VP_CONTROL1; // Reg.40 134 buf[0]=BT832_VP_CONTROL1; // Reg.40
135 buf[1]= 0x27 & (~0x01); // Default | !skip 135 buf[1]= 0x27 & (~0x01); // Default | !skip
136 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2))) 136 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
137 printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc); 137 printk("bt832: i2c i/o error EO: rc == %d (should be 2)\n",rc);
138 138
139 bt832_hexdump(i2c_client_s,buf); 139 bt832_hexdump(i2c_client_s,buf);
140 140
141 141
142 // for testing (even works when no camera attached) 142 // for testing (even works when no camera attached)
143 printk("bt832: *** Generate NTSC M Bars *****\n"); 143 printk("bt832: *** Generate NTSC M Bars *****\n");
144 buf[0]=BT832_VP_TESTCONTROL0; // Reg. 42 144 buf[0]=BT832_VP_TESTCONTROL0; // Reg. 42
145 buf[1]=3; // Generate NTSC System M bars, Generate Frame timing internally 145 buf[1]=3; // Generate NTSC System M bars, Generate Frame timing internally
146 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2))) 146 if (2 != (rc = i2c_master_send(i2c_client_s,buf,2)))
147 printk("bt832: i2c i/o error MBAR: rc == %d (should be 2)\n",rc); 147 printk("bt832: i2c i/o error MBAR: rc == %d (should be 2)\n",rc);
148 148
149 printk("Bt832: Camera Present: %s\n", 149 printk("Bt832: Camera Present: %s\n",
150 (buf[1+BT832_CAM_STATUS] & BT832_56_CAMERA_PRESENT) ? "yes":"no"); 150 (buf[1+BT832_CAM_STATUS] & BT832_56_CAMERA_PRESENT) ? "yes":"no");
151 151
152 bt832_hexdump(i2c_client_s,buf); 152 bt832_hexdump(i2c_client_s,buf);
153 kfree(buf); 153 kfree(buf);
154 return 1; 154 return 1;
155} 155}
@@ -162,17 +162,17 @@ static int bt832_attach(struct i2c_adapter *adap, int addr, int kind)
162 162
163 printk("bt832_attach\n"); 163 printk("bt832_attach\n");
164 164
165 client_template.adapter = adap; 165 client_template.adapter = adap;
166 client_template.addr = addr; 166 client_template.addr = addr;
167 167
168 printk("bt832: chip found @ 0x%x\n", addr<<1); 168 printk("bt832: chip found @ 0x%x\n", addr<<1);
169 169
170 if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL))) 170 if (NULL == (t = kmalloc(sizeof(*t), GFP_KERNEL)))
171 return -ENOMEM; 171 return -ENOMEM;
172 memset(t,0,sizeof(*t)); 172 memset(t,0,sizeof(*t));
173 t->client = client_template; 173 t->client = client_template;
174 i2c_set_clientdata(&t->client, t); 174 i2c_set_clientdata(&t->client, t);
175 i2c_attach_client(&t->client); 175 i2c_attach_client(&t->client);
176 176
177 if(! bt832_init(&t->client)) { 177 if(! bt832_init(&t->client)) {
178 bt832_detach(&t->client); 178 bt832_detach(&t->client);
@@ -211,7 +211,7 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg)
211 211
212 printk("bt832: command %x\n",cmd); 212 printk("bt832: command %x\n",cmd);
213 213
214 switch (cmd) { 214 switch (cmd) {
215 case BT832_HEXDUMP: { 215 case BT832_HEXDUMP: {
216 unsigned char *buf; 216 unsigned char *buf;
217 buf=kmalloc(65,GFP_KERNEL); 217 buf=kmalloc(65,GFP_KERNEL);