Skip to content

Commit

Permalink
Remove whitespace only from the fbcondecor patch.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mjanusz
mjanusz committed Jun 17, 2012
1 parent 91a2064 commit 00092af
Showing 1 changed file with 0 additions and 227 deletions.
227 changes: 0 additions & 227 deletions projects/fbcondecor/fbcondecor-0.9.6-3.5-rc3.patch
View file
Expand Up @@ -826,15 +826,6 @@ diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 2e471c2..b9679a7e 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -26,7 +26,7 @@
*
* Hardware cursor support added by Emmanuel Marty (core@ggi-project.org)
* Smart redraw scrolling, arbitrary font width support, 512char font support
- * and software scrollback added by
+ * and software scrollback added by
* Jakub Jelinek (jj@ultra.linux.cz)
*
* Random hacking by Martin Mares <mj@ucw.cz>
@@ -79,6 +79,7 @@
#include <asm/irq.h>

Expand All @@ -852,53 +843,11 @@ index 2e471c2..b9679a7e 100644
static signed char con2fb_map_boot[MAX_NR_CONSOLES];

static int logo_lines;
@@ -110,7 +111,7 @@ static int softback_lines;
/* console mappings */
static int first_fb_vc;
static int last_fb_vc = MAX_NR_CONSOLES - 1;
-static int fbcon_is_default = 1;
+static int fbcon_is_default = 1;
static int fbcon_has_exited;
static int primary_device = -1;
static int fbcon_has_console_bind;
@@ -286,7 +287,7 @@ static inline int fbcon_is_inactive(struct vc_data *vc, struct fb_info *info)
!vt_force_oops_output(vc);
}

-static int get_color(struct vc_data *vc, struct fb_info *info,
+int get_color(struct vc_data *vc, struct fb_info *info,
u16 c, int is_fg)
{
int depth = fb_get_color_depth(&info->var, &info->fix);
@@ -443,7 +444,7 @@ static int __init fb_console_setup(char *this_opt)
while ((options = strsep(&this_opt, ",")) != NULL) {
if (!strncmp(options, "font:", 5))
strcpy(fontname, options + 5);
-
+
if (!strncmp(options, "scrollback:", 11)) {
options += 11;
if (*options) {
@@ -458,7 +459,7 @@ static int __init fb_console_setup(char *this_opt)
} else
return 1;
}
-
+
if (!strncmp(options, "map:", 4)) {
options += 4;
if (*options) {
@@ -483,8 +484,8 @@ static int __init fb_console_setup(char *this_opt)
first_fb_vc = 0;
if (*options++ == '-')
last_fb_vc = simple_strtoul(options, &options, 10) - 1;
- fbcon_is_default = 0;
- }
+ fbcon_is_default = 0;
+ }

if (!strncmp(options, "rotate:", 7)) {
options += 7;
@@ -545,6 +546,9 @@ static int fbcon_takeover(int show_logo)
info_idx = -1;
} else {
Expand All @@ -909,15 +858,6 @@ index 2e471c2..b9679a7e 100644
}

return err;
@@ -935,7 +939,7 @@ static const char *fbcon_startup(void)
info = registered_fb[info_idx];
if (!info)
return NULL;
-
+
owner = info->fbops->owner;
if (!try_module_get(owner))
return NULL;
@@ -999,6 +1003,12 @@ static const char *fbcon_startup(void)
rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
cols /= vc->vc_font.width;
Expand Down Expand Up @@ -988,33 +928,6 @@ index 2e471c2..b9679a7e 100644
}

static void fbcon_cursor(struct vc_data *vc, int mode)
@@ -1387,7 +1412,7 @@ static __inline__ void ywrap_up(struct vc_data *vc, int count)
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct fbcon_ops *ops = info->fbcon_par;
struct display *p = &fb_display[vc->vc_num];
-
+
p->yscroll += count;
if (p->yscroll >= p->vrows) /* Deal with wrap */
p->yscroll -= p->vrows;
@@ -1406,7 +1431,7 @@ static __inline__ void ywrap_down(struct vc_data *vc, int count)
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct fbcon_ops *ops = info->fbcon_par;
struct display *p = &fb_display[vc->vc_num];
-
+
p->yscroll -= count;
if (p->yscroll < 0) /* Deal with wrap */
p->yscroll += p->vrows;
@@ -1473,7 +1498,7 @@ static __inline__ void ypan_down(struct vc_data *vc, int count)
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct display *p = &fb_display[vc->vc_num];
struct fbcon_ops *ops = info->fbcon_par;
-
+
p->yscroll -= count;
if (p->yscroll < 0) {
ops->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,
@@ -1797,7 +1822,7 @@ static int fbcon_scroll(struct vc_data *vc, int t, int b, int dir,
count = vc->vc_rows;
if (softback_top)
Expand All @@ -1033,24 +946,6 @@ index 2e471c2..b9679a7e 100644
switch (p->scrollmode) {
case SCROLL_MOVE:
fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
@@ -1982,7 +2009,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
{
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
struct display *p = &fb_display[vc->vc_num];
-
+
if (fbcon_is_inactive(vc, info))
return;

@@ -2000,7 +2027,7 @@ static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
p->vrows - p->yscroll);
}

-static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int sx,
+static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int sx,
int dy, int dx, int height, int width, u_int y_break)
{
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
@@ -2038,6 +2065,13 @@ static void fbcon_bmove_rec(struct vc_data *vc, struct display *p, int sy, int s
}
return;
Expand All @@ -1065,15 +960,6 @@ index 2e471c2..b9679a7e 100644
ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
height, width);
}
@@ -2089,7 +2123,7 @@ static void updatescrollmode(struct display *p,
}
}

-static int fbcon_resize(struct vc_data *vc, unsigned int width,
+static int fbcon_resize(struct vc_data *vc, unsigned int width,
unsigned int height, unsigned int user)
{
struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
@@ -2108,8 +2142,8 @@ static int fbcon_resize(struct vc_data *vc, unsigned int width,
var.yres = virt_h * virt_fh;
x_diff = info->var.xres - var.xres;
Expand Down Expand Up @@ -1136,19 +1022,6 @@ index 2e471c2..b9679a7e 100644
if (fbcon_is_inactive(vc, info) ||
ops->blank_state != FB_BLANK_UNBLANK)
fbcon_del_cursor_timer(info);
@@ -2257,11 +2315,10 @@ static int fbcon_switch(struct vc_data *vc)
ops->update_start(info);
}

- fbcon_set_palette(vc, color_table);
+ fbcon_set_palette(vc, color_table);
fbcon_clear_margins(vc, 0);

if (logo_shown == FBCON_LOGO_DRAW) {
-
logo_shown = fg_console;
/* This is protected above by initmem_freed */
fb_show_logo(info, ops->rotate);
@@ -2317,15 +2374,20 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch)
}
}
Expand All @@ -1174,24 +1047,6 @@ index 2e471c2..b9679a7e 100644
}

if (!blank)
@@ -2447,7 +2509,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
vc->vc_complement_mask >>= 1;
vc->vc_s_complement_mask >>= 1;
}
-
+
/* ++Edmund: reorder the attribute bits */
if (vc->vc_can_do_color) {
unsigned short *cp =
@@ -2470,7 +2532,7 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
vc->vc_complement_mask <<= 1;
vc->vc_s_complement_mask <<= 1;
}
-
+
/* ++Edmund: reorder the attribute bits */
{
unsigned short *cp =
@@ -2500,13 +2562,22 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h,
}

Expand Down Expand Up @@ -1331,15 +1186,6 @@ index 2e471c2..b9679a7e 100644
fbcon_has_exited = 1;
}

@@ -3595,7 +3722,7 @@ static void __exit fb_console_exit(void)
fbcon_exit();
console_unlock();
unregister_con_driver(&fb_con);
-}
+}

module_exit(fb_console_exit);

diff --git a/drivers/video/console/fbcondecor.c b/drivers/video/console/fbcondecor.c
new file mode 100644
index 0000000..7189ce6
Expand Down Expand Up @@ -2272,76 +2118,3 @@ index 4ab1187..6561627 100644
{ }
};

@@ -1038,7 +1051,7 @@ static struct ctl_table vm_table[] = {
.proc_handler = proc_dointvec,
},
{
- .procname = "page-cluster",
+ .procname = "page-cluster",
.data = &page_cluster,
.maxlen = sizeof(int),
.mode = 0644,
@@ -1484,7 +1497,7 @@ static struct ctl_table fs_table[] = {
.mode = 0555,
.child = inotify_table,
},
-#endif
+#endif
#ifdef CONFIG_EPOLL
{
.procname = "epoll",
@@ -1802,12 +1815,12 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table,
unsigned long page = 0;
size_t left;
char *kbuf;
-
+
if (!tbl_data || !table->maxlen || !*lenp || (*ppos && !write)) {
*lenp = 0;
return 0;
}
-
+
i = (int *) tbl_data;
vleft = table->maxlen / sizeof(*i);
left = *lenp;
@@ -1896,7 +1909,7 @@ static int do_proc_dointvec(struct ctl_table *table, int write,
* @ppos: file position
*
* Reads/writes up to table->maxlen/sizeof(unsigned int) integer
- * values from/to the user buffer, treated as an ASCII string.
+ * values from/to the user buffer, treated as an ASCII string.
*
* Returns 0 on success.
*/
@@ -2223,7 +2236,7 @@ static int do_proc_dointvec_ms_jiffies_conv(bool *negp, unsigned long *lvalp,
* @ppos: file position
*
* Reads/writes up to table->maxlen/sizeof(unsigned int) integer
- * values from/to the user buffer, treated as an ASCII string.
+ * values from/to the user buffer, treated as an ASCII string.
* The values read are assumed to be in seconds, and are converted into
* jiffies.
*
@@ -2245,8 +2258,8 @@ int proc_dointvec_jiffies(struct ctl_table *table, int write,
* @ppos: pointer to the file position
*
* Reads/writes up to table->maxlen/sizeof(unsigned int) integer
- * values from/to the user buffer, treated as an ASCII string.
- * The values read are assumed to be in 1/USER_HZ seconds, and
+ * values from/to the user buffer, treated as an ASCII string.
+ * The values read are assumed to be in 1/USER_HZ seconds, and
* are converted into jiffies.
*
* Returns 0 on success.
@@ -2268,8 +2281,8 @@ int proc_dointvec_userhz_jiffies(struct ctl_table *table, int write,
* @ppos: the current position in the file
*
* Reads/writes up to table->maxlen/sizeof(unsigned int) integer
- * values from/to the user buffer, treated as an ASCII string.
- * The values read are assumed to be in 1/1000 seconds, and
+ * values from/to the user buffer, treated as an ASCII string.
+ * The values read are assumed to be in 1/1000 seconds, and
* are converted into jiffies.
*
* Returns 0 on success.

0 comments on commit 00092af

Please sign in to comment.