From: Felipe Balbi <[EMAIL PROTECTED]>
Better indentation
Signed-off-by: Felipe Balbi <[EMAIL PROTECTED]>
---
drivers/usb/misc/sisusbvga/sisusb_con.c | 493 +++++++++++++++----------------
1 files changed, 231 insertions(+), 262 deletions(-)
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c
b/drivers/usb/misc/sisusbvga/sisusb_con.c
index aca13b8..dbf8603 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -82,16 +82,14 @@ static struct sisusb_usb_data *mysisusbs[MAX_NR_CONSOLES];
/* Forward declaration */
static const struct consw sisusb_con;
-static inline void
-sisusbcon_memsetw(u16 *s, u16 c, unsigned int count)
+static inline void sisusbcon_memsetw(u16 * s, u16 c, unsigned int count)
{
count /= 2;
while (count--)
sisusbcon_writew(c, s++);
}
-static inline void
-sisusb_initialize(struct sisusb_usb_data *sisusb)
+static inline void sisusb_initialize(struct sisusb_usb_data *sisusb)
{
/* Reset cursor and start address */
if (sisusb_setidxreg(sisusb, SISCR, 0x0c, 0x00))
@@ -112,8 +110,7 @@ sisusbcon_set_start_address(struct sisusb_usb_data *sisusb,
struct vc_data *c)
sisusb_setidxreg(sisusb, SISCR, 0x0d, (sisusb->cur_start_addr & 0xff));
}
-void
-sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location)
+void sisusb_set_cursor(struct sisusb_usb_data *sisusb, unsigned int location)
{
if (sisusb->sisusb_cursor_loc == location)
return;
@@ -141,14 +138,12 @@ sisusb_set_cursor(struct sisusb_usb_data *sisusb,
unsigned int location)
sisusb_setidxreg(sisusb, SISCR, 0x0f, (location & 0xff));
}
-static inline struct sisusb_usb_data *
-sisusb_get_sisusb(unsigned short console)
+static inline struct sisusb_usb_data *sisusb_get_sisusb(unsigned short console)
{
return mysisusbs[console];
}
-static inline int
-sisusb_sisusb_valid(struct sisusb_usb_data *sisusb)
+static inline int sisusb_sisusb_valid(struct sisusb_usb_data *sisusb)
{
if (!sisusb->present || !sisusb->ready || !sisusb->sisusb_dev)
return 0;
@@ -156,8 +151,8 @@ sisusb_sisusb_valid(struct sisusb_usb_data *sisusb)
return 1;
}
-static struct sisusb_usb_data *
-sisusb_get_sisusb_lock_and_check(unsigned short console)
+static struct sisusb_usb_data *sisusb_get_sisusb_lock_and_check(unsigned short
+ console)
{
struct sisusb_usb_data *sisusb;
@@ -174,8 +169,7 @@ sisusb_get_sisusb_lock_and_check(unsigned short console)
mutex_lock(&sisusb->lock);
- if (!sisusb_sisusb_valid(sisusb) ||
- !sisusb->havethisconsole[console]) {
+ if (!sisusb_sisusb_valid(sisusb) || !sisusb->havethisconsole[console]) {
mutex_unlock(&sisusb->lock);
return NULL;
}
@@ -183,27 +177,23 @@ sisusb_get_sisusb_lock_and_check(unsigned short console)
return sisusb;
}
-static int
-sisusb_is_inactive(struct vc_data *c, struct sisusb_usb_data *sisusb)
+static int sisusb_is_inactive(struct vc_data *c, struct sisusb_usb_data
*sisusb)
{
if (sisusb->is_gfx ||
- sisusb->textmodedestroyed ||
- c->vc_mode != KD_TEXT)
+ sisusb->textmodedestroyed || c->vc_mode != KD_TEXT)
return 1;
return 0;
}
/* con_startup console interface routine */
-static const char *
-sisusbcon_startup(void)
+static const char *sisusbcon_startup(void)
{
return "SISUSBCON";
}
/* con_init console interface routine */
-static void
-sisusbcon_init(struct vc_data *c, int init)
+static void sisusbcon_init(struct vc_data *c, int init)
{
struct sisusb_usb_data *sisusb;
int cols, rows;
@@ -267,8 +257,7 @@ sisusbcon_init(struct vc_data *c, int init)
}
/* con_deinit console interface routine */
-static void
-sisusbcon_deinit(struct vc_data *c)
+static void sisusbcon_deinit(struct vc_data *c)
{
struct sisusb_usb_data *sisusb;
int i;
@@ -289,7 +278,7 @@ sisusbcon_deinit(struct vc_data *c)
/* Free our font buffer if all consoles are gone */
if (sisusb->font_backup) {
- for(i = 0; i < MAX_NR_CONSOLES; i++) {
+ for (i = 0; i < MAX_NR_CONSOLES; i++) {
if (sisusb->havethisconsole[c->vc_num])
break;
}
@@ -308,7 +297,7 @@ sisusbcon_deinit(struct vc_data *c)
/* interface routine */
static u8
sisusbcon_build_attr(struct vc_data *c, u8 color, u8 intensity,
- u8 blink, u8 underline, u8 reverse, u8 unused)
+ u8 blink, u8 underline, u8 reverse, u8 unused)
{
u8 attr = color;
@@ -319,8 +308,7 @@ sisusbcon_build_attr(struct vc_data *c, u8 color, u8
intensity,
if (reverse)
attr = ((attr) & 0x88) |
- ((((attr) >> 4) |
- ((attr) << 4)) & 0x77);
+ ((((attr) >> 4) | ((attr) << 4)) & 0x77);
if (blink)
attr ^= 0x80;
@@ -332,8 +320,7 @@ sisusbcon_build_attr(struct vc_data *c, u8 color, u8
intensity,
}
/* Interface routine */
-static void
-sisusbcon_invert_region(struct vc_data *vc, u16 *p, int count)
+static void sisusbcon_invert_region(struct vc_data *vc, u16 * p, int count)
{
/* Invert a region. This is called with a pointer
* to the console's internal screen buffer. So we
@@ -344,9 +331,8 @@ sisusbcon_invert_region(struct vc_data *vc, u16 *p, int
count)
while (count--) {
u16 a = sisusbcon_readw(p);
- a = ((a) & 0x88ff) |
- (((a) & 0x7000) >> 4) |
- (((a) & 0x0700) << 4);
+ a = ((a) & 0x88ff) |
+ (((a) & 0x7000) >> 4) | (((a) & 0x0700) << 4);
sisusbcon_writew(a, p++);
}
@@ -363,8 +349,7 @@ sisusbcon_invert_region(struct vc_data *vc, u16 *p, int
count)
(x))
/* Interface routine */
-static void
-sisusbcon_putc(struct vc_data *c, int ch, int y, int x)
+static void sisusbcon_putc(struct vc_data *c, int ch, int y, int x)
{
struct sisusb_usb_data *sisusb;
ssize_t written;
@@ -378,9 +363,8 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x)
return;
}
-
sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),
- (long)SISUSB_HADDR(x, y), 2, &written);
+ (long)SISUSB_HADDR(x, y), 2, &written);
mutex_unlock(&sisusb->lock);
}
@@ -388,7 +372,7 @@ sisusbcon_putc(struct vc_data *c, int ch, int y, int x)
/* Interface routine */
static void
sisusbcon_putcs(struct vc_data *c, const unsigned short *s,
- int count, int y, int x)
+ int count, int y, int x)
{
struct sisusb_usb_data *sisusb;
ssize_t written;
@@ -415,7 +399,7 @@ sisusbcon_putcs(struct vc_data *c, const unsigned short *s,
}
sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(x, y),
- (long)SISUSB_HADDR(x, y), count * 2, &written);
+ (long)SISUSB_HADDR(x, y), count * 2, &written);
mutex_unlock(&sisusb->lock);
}
@@ -467,9 +451,8 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int
height, int width)
length = ((height * cols) - x - (cols - width - x)) * 2;
-
sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(x, y),
- (long)SISUSB_HADDR(x, y), length, &written);
+ (long)SISUSB_HADDR(x, y), length, &written);
mutex_unlock(&sisusb->lock);
}
@@ -477,7 +460,7 @@ sisusbcon_clear(struct vc_data *c, int y, int x, int
height, int width)
/* Interface routine */
static void
sisusbcon_bmove(struct vc_data *c, int sy, int sx,
- int dy, int dx, int height, int width)
+ int dy, int dx, int height, int width)
{
struct sisusb_usb_data *sisusb;
ssize_t written;
@@ -500,23 +483,21 @@ sisusbcon_bmove(struct vc_data *c, int sy, int sx,
length = ((height * cols) - dx - (cols - width - dx)) * 2;
-
sisusb_copy_memory(sisusb, (unsigned char *)SISUSB_VADDR(dx, dy),
- (long)SISUSB_HADDR(dx, dy), length, &written);
+ (long)SISUSB_HADDR(dx, dy), length, &written);
mutex_unlock(&sisusb->lock);
}
/* interface routine */
-static int
-sisusbcon_switch(struct vc_data *c)
+static int sisusbcon_switch(struct vc_data *c)
{
struct sisusb_usb_data *sisusb;
ssize_t written;
int length;
/* Returnvalue 0 means we have fully restored screen,
- * and vt doesn't need to call do_update_region().
+ * and vt doesn't need to call do_update_region().
* Returnvalue != 0 naturally means the opposite.
*/
@@ -543,15 +524,15 @@ sisusbcon_switch(struct vc_data *c)
/* Check that we don't copy too much */
length = min((int)c->vc_screenbuf_size,
- (int)(sisusb->scrbuf + sisusb->scrbuf_size -
c->vc_origin));
+ (int)(sisusb->scrbuf + sisusb->scrbuf_size -
+ c->vc_origin));
/* Restore the screen contents */
- sisusbcon_memcpyw((u16 *)c->vc_origin, (u16 *)c->vc_screenbuf,
- length);
+ sisusbcon_memcpyw((u16 *) c->vc_origin, (u16 *) c->vc_screenbuf,
+ length);
sisusb_copy_memory(sisusb, (unsigned char *)c->vc_origin,
- (long)SISUSB_HADDR(0, 0),
- length, &written);
+ (long)SISUSB_HADDR(0, 0), length, &written);
mutex_unlock(&sisusb->lock);
@@ -559,8 +540,7 @@ sisusbcon_switch(struct vc_data *c)
}
/* interface routine */
-static void
-sisusbcon_save_screen(struct vc_data *c)
+static void sisusbcon_save_screen(struct vc_data *c)
{
struct sisusb_usb_data *sisusb;
int length;
@@ -581,18 +561,18 @@ sisusbcon_save_screen(struct vc_data *c)
/* Check that we don't copy too much */
length = min((int)c->vc_screenbuf_size,
- (int)(sisusb->scrbuf + sisusb->scrbuf_size -
c->vc_origin));
+ (int)(sisusb->scrbuf + sisusb->scrbuf_size -
+ c->vc_origin));
/* Save the screen contents to vc's private buffer */
- sisusbcon_memcpyw((u16 *)c->vc_screenbuf, (u16 *)c->vc_origin,
- length);
+ sisusbcon_memcpyw((u16 *) c->vc_screenbuf, (u16 *) c->vc_origin,
+ length);
mutex_unlock(&sisusb->lock);
}
/* interface routine */
-static int
-sisusbcon_set_palette(struct vc_data *c, unsigned char *table)
+static int sisusbcon_set_palette(struct vc_data *c, unsigned char *table)
{
struct sisusb_usb_data *sisusb;
int i, j;
@@ -629,8 +609,7 @@ sisusbcon_set_palette(struct vc_data *c, unsigned char
*table)
}
/* interface routine */
-static int
-sisusbcon_blank(struct vc_data *c, int blank, int mode_switch)
+static int sisusbcon_blank(struct vc_data *c, int blank, int mode_switch)
{
struct sisusb_usb_data *sisusb;
u8 sr1, cr17, pmreg, cr63;
@@ -654,45 +633,44 @@ sisusbcon_blank(struct vc_data *c, int blank, int
mode_switch)
case 1: /* Normal blanking: Clear screen */
case -1:
- sisusbcon_memsetw((u16 *)c->vc_origin,
- c->vc_video_erase_char,
- c->vc_screenbuf_size);
+ sisusbcon_memsetw((u16 *) c->vc_origin,
+ c->vc_video_erase_char, c->vc_screenbuf_size);
sisusb_copy_memory(sisusb,
- (unsigned char *)c->vc_origin,
- (u32)(sisusb->vrambase +
- (c->vc_origin - sisusb->scrbuf)),
- c->vc_screenbuf_size, &written);
+ (unsigned char *)c->vc_origin,
+ (u32) (sisusb->vrambase +
+ (c->vc_origin - sisusb->scrbuf)),
+ c->vc_screenbuf_size, &written);
sisusb->con_blanked = 1;
ret = 1;
break;
- default: /* VESA blanking */
+ default: /* VESA blanking */
switch (blank) {
- case 0: /* Unblank */
- sr1 = 0x00;
- cr17 = 0x80;
+ case 0: /* Unblank */
+ sr1 = 0x00;
+ cr17 = 0x80;
pmreg = 0x00;
- cr63 = 0x00;
+ cr63 = 0x00;
ret = 1;
sisusb->con_blanked = 0;
break;
case VESA_VSYNC_SUSPEND + 1:
- sr1 = 0x20;
- cr17 = 0x80;
+ sr1 = 0x20;
+ cr17 = 0x80;
pmreg = 0x80;
- cr63 = 0x40;
+ cr63 = 0x40;
break;
case VESA_HSYNC_SUSPEND + 1:
- sr1 = 0x20;
- cr17 = 0x80;
+ sr1 = 0x20;
+ cr17 = 0x80;
pmreg = 0x40;
- cr63 = 0x40;
+ cr63 = 0x40;
break;
case VESA_POWERDOWN + 1:
- sr1 = 0x20;
- cr17 = 0x00;
+ sr1 = 0x20;
+ cr17 = 0x00;
pmreg = 0xc0;
- cr63 = 0x40;
+ cr63 = 0x40;
break;
default:
mutex_unlock(&sisusb->lock);
@@ -712,8 +690,7 @@ sisusbcon_blank(struct vc_data *c, int blank, int
mode_switch)
}
/* interface routine */
-static int
-sisusbcon_scrolldelta(struct vc_data *c, int lines)
+static int sisusbcon_scrolldelta(struct vc_data *c, int lines)
{
struct sisusb_usb_data *sisusb;
int margin = c->vc_size_row * 4;
@@ -736,7 +713,7 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines)
else {
if (sisusb->con_rolled_over >
- (c->vc_scr_end - sisusb->scrbuf) + margin) {
+ (c->vc_scr_end - sisusb->scrbuf) + margin) {
ul = c->vc_scr_end - sisusb->scrbuf;
we = sisusb->con_rolled_over + c->vc_size_row;
@@ -749,7 +726,7 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines)
}
p = (c->vc_visible_origin - sisusb->scrbuf - ul + we) % we +
- lines * c->vc_size_row;
+ lines * c->vc_size_row;
st = (c->vc_origin - sisusb->scrbuf - ul + we) % we;
@@ -773,8 +750,7 @@ sisusbcon_scrolldelta(struct vc_data *c, int lines)
}
/* Interface routine */
-static void
-sisusbcon_cursor(struct vc_data *c, int mode)
+static void sisusbcon_cursor(struct vc_data *c, int mode)
{
struct sisusb_usb_data *sisusb;
int from, to, baseline;
@@ -806,25 +782,31 @@ sisusbcon_cursor(struct vc_data *c, int mode)
baseline = c->vc_font.height - (c->vc_font.height < 10 ? 1 : 2);
switch (c->vc_cursor_type & 0x0f) {
- case CUR_BLOCK: from = 1;
- to = c->vc_font.height;
- break;
- case CUR_TWO_THIRDS: from = c->vc_font.height / 3;
- to = baseline;
- break;
- case CUR_LOWER_HALF: from = c->vc_font.height / 2;
- to = baseline;
- break;
- case CUR_LOWER_THIRD: from = (c->vc_font.height * 2) / 3;
- to = baseline;
- break;
- case CUR_NONE: from = 31;
- to = 30;
- break;
- default:
- case CUR_UNDERLINE: from = baseline - 1;
- to = baseline;
- break;
+ case CUR_BLOCK:
+ from = 1;
+ to = c->vc_font.height;
+ break;
+ case CUR_TWO_THIRDS:
+ from = c->vc_font.height / 3;
+ to = baseline;
+ break;
+ case CUR_LOWER_HALF:
+ from = c->vc_font.height / 2;
+ to = baseline;
+ break;
+ case CUR_LOWER_THIRD:
+ from = (c->vc_font.height * 2) / 3;
+ to = baseline;
+ break;
+ case CUR_NONE:
+ from = 31;
+ to = 30;
+ break;
+ default:
+ case CUR_UNDERLINE:
+ from = baseline - 1;
+ to = baseline;
+ break;
}
if (sisusb->sisusb_cursor_size_from != from ||
@@ -834,7 +816,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)
sisusb_setidxregandor(sisusb, SISCR, 0x0b, 0xe0, to);
sisusb->sisusb_cursor_size_from = from;
- sisusb->sisusb_cursor_size_to = to;
+ sisusb->sisusb_cursor_size_to = to;
}
mutex_unlock(&sisusb->lock);
@@ -842,7 +824,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)
static int
sisusbcon_scroll_area(struct vc_data *c, struct sisusb_usb_data *sisusb,
- int t, int b, int dir, int lines)
+ int t, int b, int dir, int lines)
{
int cols = sisusb->sisusb_num_columns;
int length = ((b - t) * cols) * 2;
@@ -859,25 +841,24 @@ sisusbcon_scroll_area(struct vc_data *c, struct
sisusb_usb_data *sisusb,
switch (dir) {
- case SM_UP:
- sisusbcon_memmovew(SISUSB_VADDR(0, t),
- SISUSB_VADDR(0, t + lines),
- (b - t - lines) * cols * 2);
- sisusbcon_memsetw(SISUSB_VADDR(0, b - lines), eattr,
- lines * cols * 2);
- break;
+ case SM_UP:
+ sisusbcon_memmovew(SISUSB_VADDR(0, t),
+ SISUSB_VADDR(0, t + lines),
+ (b - t - lines) * cols * 2);
+ sisusbcon_memsetw(SISUSB_VADDR(0, b - lines), eattr,
+ lines * cols * 2);
+ break;
- case SM_DOWN:
- sisusbcon_memmovew(SISUSB_VADDR(0, t + lines),
- SISUSB_VADDR(0, t),
- (b - t - lines) * cols * 2);
- sisusbcon_memsetw(SISUSB_VADDR(0, t), eattr,
- lines * cols * 2);
- break;
+ case SM_DOWN:
+ sisusbcon_memmovew(SISUSB_VADDR(0, t + lines),
+ SISUSB_VADDR(0, t),
+ (b - t - lines) * cols * 2);
+ sisusbcon_memsetw(SISUSB_VADDR(0, t), eattr, lines * cols * 2);
+ break;
}
sisusb_copy_memory(sisusb, (char *)SISUSB_VADDR(0, t),
- (long)SISUSB_HADDR(0, t), length, &written);
+ (long)SISUSB_HADDR(0, t), length, &written);
mutex_unlock(&sisusb->lock);
@@ -885,8 +866,7 @@ sisusbcon_scroll_area(struct vc_data *c, struct
sisusb_usb_data *sisusb,
}
/* Interface routine */
-static int
-sisusbcon_scroll(struct vc_data *c, int t, int b, int dir, int lines)
+static int sisusbcon_scroll(struct vc_data *c, int t, int b, int dir, int
lines)
{
struct sisusb_usb_data *sisusb;
u16 eattr = c->vc_video_erase_char;
@@ -936,9 +916,9 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int dir,
int lines)
case SM_UP:
if (c->vc_scr_end + delta >=
- sisusb->scrbuf + sisusb->scrbuf_size) {
- sisusbcon_memcpyw((u16 *)sisusb->scrbuf,
- (u16 *)(oldorigin + delta),
+ sisusb->scrbuf + sisusb->scrbuf_size) {
+ sisusbcon_memcpyw((u16 *) sisusb->scrbuf,
+ (u16 *) (oldorigin + delta),
c->vc_screenbuf_size - delta);
c->vc_origin = sisusb->scrbuf;
sisusb->con_rolled_over = oldorigin - sisusb->scrbuf;
@@ -946,24 +926,22 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int
dir, int lines)
} else
c->vc_origin += delta;
- sisusbcon_memsetw(
- (u16 *)(c->vc_origin + c->vc_screenbuf_size - delta),
- eattr, delta);
+ sisusbcon_memsetw((u16 *) (c->vc_origin + c->vc_screenbuf_size -
+ delta), eattr, delta);
break;
case SM_DOWN:
if (oldorigin - delta < sisusb->scrbuf) {
- sisusbcon_memmovew((u16 *)(sisusb->scrbuf +
- sisusb->scrbuf_size -
- c->vc_screenbuf_size +
- delta),
- (u16 *)oldorigin,
+ sisusbcon_memmovew((u16 *) (sisusb->scrbuf +
+ sisusb->scrbuf_size -
+ c->vc_screenbuf_size +
+ delta),
+ (u16 *) oldorigin,
c->vc_screenbuf_size - delta);
c->vc_origin = sisusb->scrbuf +
- sisusb->scrbuf_size -
- c->vc_screenbuf_size;
+ sisusb->scrbuf_size - c->vc_screenbuf_size;
sisusb->con_rolled_over = 0;
copyall = 1;
} else
@@ -971,29 +949,30 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int
dir, int lines)
c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
- scr_memsetw((u16 *)(c->vc_origin), eattr, delta);
+ scr_memsetw((u16 *) (c->vc_origin), eattr, delta);
break;
}
- originoffset = (u32)(c->vc_origin - sisusb->scrbuf);
+ originoffset = (u32) (c->vc_origin - sisusb->scrbuf);
if (copyall)
sisusb_copy_memory(sisusb,
- (char *)c->vc_origin,
- (u32)(sisusb->vrambase + originoffset),
- c->vc_screenbuf_size, &written);
+ (char *)c->vc_origin,
+ (u32) (sisusb->vrambase + originoffset),
+ c->vc_screenbuf_size, &written);
else if (dir == SM_UP)
sisusb_copy_memory(sisusb,
- (char *)c->vc_origin + c->vc_screenbuf_size - delta,
- (u32)sisusb->vrambase + originoffset +
- c->vc_screenbuf_size - delta,
- delta, &written);
+ (char *)c->vc_origin + c->vc_screenbuf_size -
+ delta,
+ (u32) sisusb->vrambase + originoffset +
+ c->vc_screenbuf_size - delta, delta,
+ &written);
else
sisusb_copy_memory(sisusb,
- (char *)c->vc_origin,
- (u32)(sisusb->vrambase + originoffset),
- delta, &written);
+ (char *)c->vc_origin,
+ (u32) (sisusb->vrambase + originoffset),
+ delta, &written);
c->vc_scr_end = c->vc_origin + c->vc_screenbuf_size;
c->vc_visible_origin = c->vc_origin;
@@ -1008,14 +987,13 @@ sisusbcon_scroll(struct vc_data *c, int t, int b, int
dir, int lines)
}
/* Interface routine */
-static int
-sisusbcon_set_origin(struct vc_data *c)
+static int sisusbcon_set_origin(struct vc_data *c)
{
struct sisusb_usb_data *sisusb;
/* Returning != 0 means we were successful.
* Returning 0 will vt make to use its own
- * screenbuffer as the origin.
+ * screenbuffer as the origin.
*/
if (!(sisusb = sisusb_get_sisusb_lock_and_check(c->vc_num)))
@@ -1068,8 +1046,8 @@ sisusbcon_resize(struct vc_data *c, unsigned int newcols,
unsigned int newrows)
int
sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int set, int slot,
- u8 *arg, int cmapsz, int ch512, int dorecalc,
- struct vc_data *c, int fh, int uplock)
+ u8 * arg, int cmapsz, int ch512, int dorecalc,
+ struct vc_data *c, int fh, int uplock)
{
int font_select = 0x00, i, err = 0;
u32 offset = 0;
@@ -1100,17 +1078,17 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb,
int set, int slot,
font_select = (slot == 0) ? 0x00 : (ch512 ? 0x0e : 0x0a);
- err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x01); /* Reset */
- err |= sisusb_setidxreg(sisusb, SISSR, 0x02, 0x04); /* Write to plane 2
*/
- err |= sisusb_setidxreg(sisusb, SISSR, 0x04, 0x07); /* Memory mode
a0-bf */
- err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x03); /* Reset */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x01); /* Reset */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x02, 0x04); /* Write to
plane 2 */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x04, 0x07); /* Memory mode
a0-bf */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x03); /* Reset */
if (err)
goto font_op_error;
- err |= sisusb_setidxreg(sisusb, SISGR, 0x04, 0x03); /* Select plane
read 2 */
- err |= sisusb_setidxreg(sisusb, SISGR, 0x05, 0x00); /* Disable odd/even
*/
- err |= sisusb_setidxreg(sisusb, SISGR, 0x06, 0x00); /* Address range
a0-bf */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x04, 0x03); /* Select plane
read 2 */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x05, 0x00); /* Disable
odd/even */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x06, 0x00); /* Address
range a0-bf */
if (err)
goto font_op_error;
@@ -1119,16 +1097,15 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb,
int set, int slot,
if (set)
for (i = 0; i < cmapsz; i++) {
err |= sisusb_writeb(sisusb,
- sisusb->vrambase + offset + i,
- arg[i]);
+ sisusb->vrambase + offset +
+ i, arg[i]);
if (err)
break;
- }
- else
+ } else
for (i = 0; i < cmapsz; i++) {
err |= sisusb_readb(sisusb,
- sisusb->vrambase + offset + i,
- &arg[i]);
+ sisusb->vrambase + offset +
+ i, &arg[i]);
if (err)
break;
}
@@ -1142,18 +1119,19 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb,
int set, int slot,
if (set)
for (i = 0; i < cmapsz; i++) {
err |= sisusb_writeb(sisusb,
- sisusb->vrambase + offset +
- (2 * cmapsz) + i,
- arg[cmapsz + i]);
+ sisusb->vrambase +
+ offset +
+ (2 * cmapsz) + i,
+ arg[cmapsz + i]);
if (err)
break;
- }
- else
+ } else
for (i = 0; i < cmapsz; i++) {
err |= sisusb_readb(sisusb,
- sisusb->vrambase + offset +
- (2 * cmapsz) + i,
- &arg[cmapsz + i]);
+ sisusb->vrambase +
+ offset +
+ (2 * cmapsz) + i,
+ &arg[cmapsz + i]);
if (err)
break;
}
@@ -1163,19 +1141,19 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb,
int set, int slot,
if (err)
goto font_op_error;
- err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x01); /* Reset */
- err |= sisusb_setidxreg(sisusb, SISSR, 0x02, 0x03); /* Write to planes
0+1 */
- err |= sisusb_setidxreg(sisusb, SISSR, 0x04, 0x03); /* Memory mode
a0-bf */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x01); /* Reset */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x02, 0x03); /* Write to
planes 0+1 */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x04, 0x03); /* Memory mode
a0-bf */
if (set)
sisusb_setidxreg(sisusb, SISSR, 0x03, font_select);
- err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x03); /* Reset end */
+ err |= sisusb_setidxreg(sisusb, SISSR, 0x00, 0x03); /* Reset end */
if (err)
goto font_op_error;
- err |= sisusb_setidxreg(sisusb, SISGR, 0x04, 0x00); /* Select plane
read 0 */
- err |= sisusb_setidxreg(sisusb, SISGR, 0x05, 0x10); /* Enable odd/even
*/
- err |= sisusb_setidxreg(sisusb, SISGR, 0x06, 0x06); /* Address range
b8-bf */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x04, 0x00); /* Select plane
read 0 */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x05, 0x10); /* Enable
odd/even */
+ err |= sisusb_setidxreg(sisusb, SISGR, 0x06, 0x06); /* Address
range b8-bf */
if (err)
goto font_op_error;
@@ -1194,8 +1172,8 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int
set, int slot,
sisusb->current_font_512 = ch512;
/* color plane enable register:
- 256-char: enable intensity bit
- 512-char: disable intensity bit */
+ 256-char: enable intensity bit
+ 512-char: disable intensity bit */
sisusb_getreg(sisusb, SISINPSTAT, &dummy);
sisusb_setreg(sisusb, SISAR, 0x12);
sisusb_setreg(sisusb, SISAR, ch512 ? 0x07 : 0x0f);
@@ -1222,13 +1200,12 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb,
int set, int slot,
maxscan = rows * fh - 1;
/*printk(KERN_DEBUG "sisusb recalc rows %d maxscan %d
fh %d sl %d\n",
- rows, maxscan, fh, c->vc_scan_lines);*/
+ rows, maxscan, fh, c->vc_scan_lines); */
sisusb_getidxreg(sisusb, SISCR, 0x07, &ovr);
vde = maxscan & 0xff;
ovr = (ovr & 0xbd) |
- ((maxscan & 0x100) >> 7) |
- ((maxscan & 0x200) >> 3);
+ ((maxscan & 0x100) >> 7) | ((maxscan & 0x200) >> 3);
sisusb_setidxreg(sisusb, SISCR, 0x07, ovr);
sisusb_setidxreg(sisusb, SISCR, 0x12, vde);
@@ -1240,7 +1217,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int
set, int slot,
sisusb->current_font_height = fh;
sisusb->sisusb_cursor_size_from = -1;
- sisusb->sisusb_cursor_size_to = -1;
+ sisusb->sisusb_cursor_size_to = -1;
}
@@ -1267,7 +1244,7 @@ sisusbcon_do_font_op(struct sisusb_usb_data *sisusb, int
set, int slot,
return 0;
-font_op_error:
+ font_op_error:
if (uplock)
mutex_unlock(&sisusb->lock);
@@ -1276,8 +1253,7 @@ font_op_error:
/* Interface routine */
static int
-sisusbcon_font_set(struct vc_data *c, struct console_font *font,
- unsigned flags)
+sisusbcon_font_set(struct vc_data *c, struct console_font *font, unsigned
flags)
{
struct sisusb_usb_data *sisusb;
unsigned charcount = font->charcount;
@@ -1314,14 +1290,13 @@ sisusbcon_font_set(struct vc_data *c, struct
console_font *font,
/* do_font_op ups sisusb->lock */
return sisusbcon_do_font_op(sisusb, 1, 2, font->data,
- 8192, (charcount == 512),
- (!(flags & KD_FONT_FLAG_DONT_RECALC)) ? 1 : 0,
- c, font->height, 1);
+ 8192, (charcount == 512),
+ (!(flags & KD_FONT_FLAG_DONT_RECALC)) ? 1 :
+ 0, c, font->height, 1);
}
/* Interface routine */
-static int
-sisusbcon_font_get(struct vc_data *c, struct console_font *font)
+static int sisusbcon_font_get(struct vc_data *c, struct console_font *font)
{
struct sisusb_usb_data *sisusb;
@@ -1357,76 +1332,75 @@ sisusbcon_font_get(struct vc_data *c, struct
console_font *font)
*/
static const struct consw sisusb_con = {
- .owner = THIS_MODULE,
- .con_startup = sisusbcon_startup,
- .con_init = sisusbcon_init,
- .con_deinit = sisusbcon_deinit,
- .con_clear = sisusbcon_clear,
- .con_putc = sisusbcon_putc,
- .con_putcs = sisusbcon_putcs,
- .con_cursor = sisusbcon_cursor,
- .con_scroll = sisusbcon_scroll,
- .con_bmove = sisusbcon_bmove,
- .con_switch = sisusbcon_switch,
- .con_blank = sisusbcon_blank,
- .con_font_set = sisusbcon_font_set,
- .con_font_get = sisusbcon_font_get,
- .con_set_palette = sisusbcon_set_palette,
- .con_scrolldelta = sisusbcon_scrolldelta,
- .con_build_attr = sisusbcon_build_attr,
- .con_invert_region = sisusbcon_invert_region,
- .con_set_origin = sisusbcon_set_origin,
- .con_save_screen = sisusbcon_save_screen,
- .con_resize = sisusbcon_resize,
+ .owner = THIS_MODULE,
+ .con_startup = sisusbcon_startup,
+ .con_init = sisusbcon_init,
+ .con_deinit = sisusbcon_deinit,
+ .con_clear = sisusbcon_clear,
+ .con_putc = sisusbcon_putc,
+ .con_putcs = sisusbcon_putcs,
+ .con_cursor = sisusbcon_cursor,
+ .con_scroll = sisusbcon_scroll,
+ .con_bmove = sisusbcon_bmove,
+ .con_switch = sisusbcon_switch,
+ .con_blank = sisusbcon_blank,
+ .con_font_set = sisusbcon_font_set,
+ .con_font_get = sisusbcon_font_get,
+ .con_set_palette = sisusbcon_set_palette,
+ .con_scrolldelta = sisusbcon_scrolldelta,
+ .con_build_attr = sisusbcon_build_attr,
+ .con_invert_region = sisusbcon_invert_region,
+ .con_set_origin = sisusbcon_set_origin,
+ .con_save_screen = sisusbcon_save_screen,
+ .con_resize = sisusbcon_resize,
};
/* Our very own dummy console driver */
static const char *sisusbdummycon_startup(void)
{
- return "SISUSBVGADUMMY";
+ return "SISUSBVGADUMMY";
}
static void sisusbdummycon_init(struct vc_data *vc, int init)
{
- vc->vc_can_do_color = 1;
- if (init) {
- vc->vc_cols = 80;
- vc->vc_rows = 25;
- } else
- vc_resize(vc, 80, 25);
+ vc->vc_can_do_color = 1;
+ if (init) {
+ vc->vc_cols = 80;
+ vc->vc_rows = 25;
+ } else
+ vc_resize(vc, 80, 25);
}
static int sisusbdummycon_dummy(void)
{
- return 0;
+ return 0;
}
#define SISUSBCONDUMMY (void *)sisusbdummycon_dummy
static const struct consw sisusb_dummy_con = {
- .owner = THIS_MODULE,
- .con_startup = sisusbdummycon_startup,
- .con_init = sisusbdummycon_init,
- .con_deinit = SISUSBCONDUMMY,
- .con_clear = SISUSBCONDUMMY,
- .con_putc = SISUSBCONDUMMY,
- .con_putcs = SISUSBCONDUMMY,
- .con_cursor = SISUSBCONDUMMY,
- .con_scroll = SISUSBCONDUMMY,
- .con_bmove = SISUSBCONDUMMY,
- .con_switch = SISUSBCONDUMMY,
- .con_blank = SISUSBCONDUMMY,
- .con_font_set = SISUSBCONDUMMY,
- .con_font_get = SISUSBCONDUMMY,
- .con_font_default = SISUSBCONDUMMY,
- .con_font_copy = SISUSBCONDUMMY,
- .con_set_palette = SISUSBCONDUMMY,
- .con_scrolldelta = SISUSBCONDUMMY,
+ .owner = THIS_MODULE,
+ .con_startup = sisusbdummycon_startup,
+ .con_init = sisusbdummycon_init,
+ .con_deinit = SISUSBCONDUMMY,
+ .con_clear = SISUSBCONDUMMY,
+ .con_putc = SISUSBCONDUMMY,
+ .con_putcs = SISUSBCONDUMMY,
+ .con_cursor = SISUSBCONDUMMY,
+ .con_scroll = SISUSBCONDUMMY,
+ .con_bmove = SISUSBCONDUMMY,
+ .con_switch = SISUSBCONDUMMY,
+ .con_blank = SISUSBCONDUMMY,
+ .con_font_set = SISUSBCONDUMMY,
+ .con_font_get = SISUSBCONDUMMY,
+ .con_font_default = SISUSBCONDUMMY,
+ .con_font_copy = SISUSBCONDUMMY,
+ .con_set_palette = SISUSBCONDUMMY,
+ .con_scrolldelta = SISUSBCONDUMMY,
};
-int
-sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)
+int sisusb_console_init(struct sisusb_usb_data *sisusb, int first, int last)
{
int i, ret, minor = sisusb->minor;
@@ -1439,11 +1413,9 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int
first, int last)
}
sisusb->con_first = first;
- sisusb->con_last = last;
+ sisusb->con_last = last;
- if (first > last ||
- first > MAX_NR_CONSOLES ||
- last > MAX_NR_CONSOLES) {
+ if (first > last || first > MAX_NR_CONSOLES || last > MAX_NR_CONSOLES) {
mutex_unlock(&sisusb->lock);
return 1;
}
@@ -1454,9 +1426,9 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int
first, int last)
return 0;
}
- sisusb->sisusb_cursor_loc = -1;
+ sisusb->sisusb_cursor_loc = -1;
sisusb->sisusb_cursor_size_from = -1;
- sisusb->sisusb_cursor_size_to = -1;
+ sisusb->sisusb_cursor_size_to = -1;
/* Set up text mode (and upload default font) */
if (sisusb_reset_text_mode(sisusb, 1)) {
@@ -1482,7 +1454,8 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int
first, int last)
/* Allocate screen buffer */
if (!(sisusb->scrbuf = (unsigned long)vmalloc(sisusb->scrbuf_size))) {
mutex_unlock(&sisusb->lock);
- dev_err(sisusb->sisusb_dev, "Failed to allocate screen
buffer\n");
+ dev_err(sisusb->sisusb_dev,
+ "Failed to allocate screen buffer\n");
return 1;
}
@@ -1501,8 +1474,7 @@ sisusb_console_init(struct sisusb_usb_data *sisusb, int
first, int last)
return ret;
}
-void
-sisusb_console_exit(struct sisusb_usb_data *sisusb)
+void sisusb_console_exit(struct sisusb_usb_data *sisusb)
{
int i;
@@ -1536,9 +1508,9 @@ sisusb_console_exit(struct sisusb_usb_data *sisusb)
for (i = 0; i < MAX_NR_CONSOLES; i++)
if (sisusb->havethisconsole[i])
take_over_console(&sisusb_dummy_con, i, i, 0);
- /* At this point, con_deinit for all our
- * consoles is executed by take_over_console().
- */
+ /* At this point, con_deinit for all our
+ * consoles is executed by take_over_console().
+ */
sisusb->haveconsole = 0;
}
@@ -1558,6 +1530,3 @@ void __init sisusb_init_concode(void)
}
#endif /* INCL_CON */
-
-
-
--
1.5.3.rc4.24.g5b56a
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
linux-usb-devel@lists.sourceforge.net
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
