Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 8225
b: refs/heads/master
c: c5eb5c1
h: refs/heads/master
i:
  8223: b68a5f1
v: v3
  • Loading branch information
Knut Petersen authored and Linus Torvalds committed Sep 9, 2005
1 parent 215fe16 commit f630aa6
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 9fa68eae9f8291a98bfe00b94b78f72eb253165a
refs/heads/master: c5eb5c1ea919f3f717236c5d0892f9c37f19de37
8 changes: 6 additions & 2 deletions trunk/drivers/video/console/bitblit.c
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
unsigned int scan_align = info->pixmap.scan_align - 1;
unsigned int buf_align = info->pixmap.buf_align - 1;
unsigned int shift_low = 0, mod = vc->vc_font.width % 8;
unsigned int shift_high = 8, pitch, cnt, size, k;
unsigned int shift_high = 8, pitch, cnt, size, i, k;
unsigned int idx = vc->vc_font.width >> 3;
unsigned int attribute = get_attribute(info, scr_readw(s));
struct fb_image image;
Expand Down Expand Up @@ -175,7 +175,11 @@ static void bit_putcs(struct vc_data *vc, struct fb_info *info,
src = buf;
}

fb_pad_aligned_buffer(dst, pitch, src, idx, image.height);
if (idx == 1)
for(i=0; i < image.height; i++)
dst[pitch*i] = src[i];
else
fb_pad_aligned_buffer(dst, pitch, src, idx, image.height);
dst += width;
}
}
Expand Down

0 comments on commit f630aa6

Please sign in to comment.