summaryrefslogtreecommitdiff
path: root/payloads/libpayload/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'payloads/libpayload/drivers')
-rw-r--r--payloads/libpayload/drivers/keyboard.c57
-rw-r--r--payloads/libpayload/drivers/serial.c20
-rw-r--r--payloads/libpayload/drivers/vga.c62
3 files changed, 65 insertions, 74 deletions
diff --git a/payloads/libpayload/drivers/keyboard.c b/payloads/libpayload/drivers/keyboard.c
index 0dc93713b8..9a3e4b8d19 100644
--- a/payloads/libpayload/drivers/keyboard.c
+++ b/payloads/libpayload/drivers/keyboard.c
@@ -31,26 +31,26 @@
#include <libpayload.h>
unsigned char map[2][0x57] = {
- {
- 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
- 0x37, 0x38, 0x39, 0x30, 0x2D, 0x3D, 0x08, 0x09,
- 0x71, 0x77, 0x65, 0x72, 0x74, 0x79, 0x75, 0x69,
- 0x6F, 0x70, 0x5B, 0x5D, 0x0A, 0x00, 0x61, 0x73,
- 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x3B,
- 0x27, 0x60, 0x00, 0x5C, 0x7A, 0x78, 0x63, 0x76,
- 0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2F, 0x00, 0x2A,
- 0x00, 0x20,
- },
- {
- 0x00, 0x1B, 0x21, 0x40, 0x23, 0x24, 0x25, 0x5E,
- 0x26, 0x2A, 0x28, 0x29, 0x5F, 0x2B, 0x08, 0x00,
- 0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49,
- 0x4F, 0x50, 0x7B, 0x7D, 0x0A, 0x00, 0x41, 0x53,
- 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x3A,
- 0x22, 0x7E, 0x00, 0x7C, 0x5A, 0x58, 0x43, 0x56,
- 0x42, 0x4E, 0x4D, 0x3C, 0x3E, 0x3F, 0x00, 0x2A,
- 0x00, 0x20,
- }
+ {
+ 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36,
+ 0x37, 0x38, 0x39, 0x30, 0x2D, 0x3D, 0x08, 0x09,
+ 0x71, 0x77, 0x65, 0x72, 0x74, 0x79, 0x75, 0x69,
+ 0x6F, 0x70, 0x5B, 0x5D, 0x0A, 0x00, 0x61, 0x73,
+ 0x64, 0x66, 0x67, 0x68, 0x6A, 0x6B, 0x6C, 0x3B,
+ 0x27, 0x60, 0x00, 0x5C, 0x7A, 0x78, 0x63, 0x76,
+ 0x62, 0x6E, 0x6D, 0x2C, 0x2E, 0x2F, 0x00, 0x2A,
+ 0x00, 0x20,
+ },
+ {
+ 0x00, 0x1B, 0x21, 0x40, 0x23, 0x24, 0x25, 0x5E,
+ 0x26, 0x2A, 0x28, 0x29, 0x5F, 0x2B, 0x08, 0x00,
+ 0x51, 0x57, 0x45, 0x52, 0x54, 0x59, 0x55, 0x49,
+ 0x4F, 0x50, 0x7B, 0x7D, 0x0A, 0x00, 0x41, 0x53,
+ 0x44, 0x46, 0x47, 0x48, 0x4A, 0x4B, 0x4C, 0x3A,
+ 0x22, 0x7E, 0x00, 0x7C, 0x5A, 0x58, 0x43, 0x56,
+ 0x42, 0x4E, 0x4D, 0x3C, 0x3E, 0x3F, 0x00, 0x2A,
+ 0x00, 0x20,
+ }
};
#define MOD_SHIFT 1
@@ -78,32 +78,26 @@ int keyboard_getchar(void)
static int modifier;
unsigned char ch;
int shift;
-
int ret = 0;
- while(!keyboard_havechar())
- ;
+ while (!keyboard_havechar()) ;
ch = keyboard_get_scancode();
- switch(ch) {
+ switch (ch) {
case 0x36:
case 0x2a:
modifier &= ~MOD_SHIFT;
break;
-
case 0x80 | 0x36:
case 0x80 | 0x2a:
modifier |= MOD_SHIFT;
-
case 0x1d:
modifier &= ~MOD_CTRL;
break;
-
case 0x80 | 0x1d:
modifier |= MOD_CTRL;
break;
-
case 0x3a:
if (modifier & MOD_CAPSLOCK)
modifier &= ~MOD_CAPSLOCK;
@@ -112,12 +106,13 @@ int keyboard_getchar(void)
break;
}
- if (!(ch & 0x80) && ch < 0x57) {
- shift = (modifier & MOD_SHIFT) ^ (modifier & MOD_CAPSLOCK) ? 1 : 0;
+ if (!(ch & 0x80) && ch < 0x57) {
+ shift =
+ (modifier & MOD_SHIFT) ^ (modifier & MOD_CAPSLOCK) ? 1 : 0;
ret = map[shift][ch];
if (modifier & MOD_CTRL)
- ret = (ret >= 0x3F && ret <= 0x5F) ? ret & 0x1f : 0;
+ ret = (ret >= 0x3F && ret <= 0x5F) ? ret & 0x1f : 0;
return ret;
}
diff --git a/payloads/libpayload/drivers/serial.c b/payloads/libpayload/drivers/serial.c
index bcf60df614..b3179c756d 100644
--- a/payloads/libpayload/drivers/serial.c
+++ b/payloads/libpayload/drivers/serial.c
@@ -37,32 +37,32 @@
#endif
void serial_init(void)
-{
+{
#ifdef CONFIG_SERIAL_SET_SPEED
unsigned char reg;
- /* Disable interrupts */
+ /* Disable interrupts. */
outb(0, IOBASE + 0x01);
- /* Assert RTS and DTR */
+ /* Assert RTS and DTR. */
outb(3, IOBASE + 0x04);
- /* Set the divisor latch */
+ /* Set the divisor latch. */
reg = inb(IOBASE + 0x03);
outb(reg | 0x80, IOBASE + 0x03);
- /* Write the divisor */
+ /* Write the divisor. */
outb(DIVISOR & 0xFF, IOBASE);
outb(DIVISOR >> 8 & 0xFF, IOBASE + 1);
- /* Restore the previous value of the divisor */
+ /* Restore the previous value of the divisor. */
outb(reg &= ~0x80, IOBASE + 0x03);
#endif
}
-
+
void serial_putchar(unsigned char c)
{
- while((inb(IOBASE + 0x05) & 0x20) == 0);
+ while ((inb(IOBASE + 0x05) & 0x20) == 0) ;
outb(c, IOBASE);
}
@@ -73,6 +73,6 @@ int serial_havechar(void)
int serial_getchar(void)
{
- while (!serial_havechar());
- return (int) inb(IOBASE);
+ while (!serial_havechar()) ;
+ return (int)inb(IOBASE);
}
diff --git a/payloads/libpayload/drivers/vga.c b/payloads/libpayload/drivers/vga.c
index 5e0e406f27..fd1dd35abb 100644
--- a/payloads/libpayload/drivers/vga.c
+++ b/payloads/libpayload/drivers/vga.c
@@ -38,8 +38,8 @@
#define CRTC_INDEX 0x3d4
#define CRTC_DATA 0x3d5
-#define VIDEO(_r, _c)\
- ((uint16_t *) (0xB8000 + ((_r) * (WIDTH * 2)) + ((_c) * 2)))
+#define VIDEO(_r, _c) \
+ ((uint16_t *) (0xB8000 + ((_r) * (WIDTH * 2)) + ((_c) * 2)))
static int cursor_enabled;
static int cursorx;
@@ -49,24 +49,25 @@ static void vga_scroll_up(void);
static inline uint8_t crtc_read(uint8_t index)
{
- outb(index, CRTC_INDEX);
- return inb(CRTC_DATA);
+ outb(index, CRTC_INDEX);
+ return inb(CRTC_DATA);
}
static inline void crtc_write(uint8_t data, uint8_t index)
{
- outb(index, CRTC_INDEX);
- outb(data, CRTC_DATA);
+ outb(index, CRTC_INDEX);
+ outb(data, CRTC_DATA);
}
static void vga_get_cursor_pos(void)
{
unsigned int addr;
- addr = ((unsigned int) crtc_read(0x0E)) << 8;
+
+ addr = ((unsigned int)crtc_read(0x0E)) << 8;
addr += crtc_read(0x0E);
cursorx = addr % WIDTH;
- cursory = addr / WIDTH;
+ cursory = addr / WIDTH;
}
static void vga_fixup_cursor(void)
@@ -78,16 +79,16 @@ static void vga_fixup_cursor(void)
if (cursorx < 0)
cursorx = 0;
-
+
if (cursory < 0)
cursory = 0;
-
+
if (cursorx >= WIDTH) {
cursorx = 0;
cursory++;
}
- while(cursory >= HEIGHT)
+ while (cursory >= HEIGHT)
vga_scroll_up();
addr = cursorx + (WIDTH * cursory);
@@ -102,8 +103,7 @@ void vga_cursor_enable(int state)
if (state == 0) {
tmp |= (1 << 5);
cursor_enabled = 0;
- }
- else {
+ } else {
tmp &= ~(1 << 5);
cursor_enabled = 1;
vga_fixup_cursor();
@@ -117,19 +117,19 @@ void vga_clear_line(uint8_t row, uint8_t ch, uint8_t attr)
int col;
uint16_t *ptr = VIDEO(0, row);
- for(col = 0; col < WIDTH; col++)
+ for (col = 0; col < WIDTH; col++)
ptr[col] = ((attr & 0xFF) << 8) | (ch & 0xFF);
}
-
+
static void vga_scroll_up(void)
{
- uint16_t *src = VIDEO(0,1);
- uint16_t *dst = VIDEO(0,0);
+ uint16_t *src = VIDEO(0, 1);
+ uint16_t *dst = VIDEO(0, 0);
int i;
- for(i = 0; i < (HEIGHT - 1) * WIDTH; i++)
+ for (i = 0; i < (HEIGHT - 1) * WIDTH; i++)
*dst++ = *src++;
-
+
vga_clear_line(HEIGHT - 1, ' ', VGA_COLOR_WHITE);
cursory--;
}
@@ -137,7 +137,7 @@ static void vga_scroll_up(void)
void vga_fill(uint8_t ch, uint8_t attr)
{
uint8_t row;
- for(row = 0; row < HEIGHT; row++)
+ for (row = 0; row < HEIGHT; row++)
vga_clear_line(row, ch, attr);
}
@@ -153,11 +153,12 @@ void vga_putc(uint8_t row, uint8_t col, unsigned int c)
*ptr = (uint16_t) (c & 0xFFFF);
}
-void vga_putchar(unsigned int ch) {
-
+void vga_putchar(unsigned int ch)
+{
+
uint16_t *ptr;
- switch(ch & 0xFF) {
+ switch (ch & 0xFF) {
case '\r':
cursorx = 0;
break;
@@ -187,30 +188,25 @@ int vga_move_cursor(int x, int y)
{
cursorx = x;
cursory = y;
-
+
vga_fixup_cursor();
}
void vga_init(void)
{
- /* Get the position of the cursor */
+ /* Get the position of the cursor. */
vga_get_cursor_pos();
- /* See if it us currently enabled or not */
+ /* See if it currently enabled or not. */
cursor_enabled = !(crtc_read(0x0A) & (1 << 5));
- /* If the cursor is enabled, get us to a sane point */
-
+ /* If the cursor is enabled, get us to a sane point. */
if (cursor_enabled) {
-
- /* Go to the next line */
-
+ /* Go to the next line. */
if (cursorx) {
cursorx = 0;
cursory++;
}
-
vga_fixup_cursor();
}
}
-