Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-video

Browse Source
master
Tom Rini 9 years ago
parent 60b25259a5 4b6d09449f
commit ed02c532be
18 changed files with 13 additions and 26 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      arch/blackfin/cpu/jtag-console.c
  2. 1
      arch/powerpc/cpu/mpc8xx/video.c
  3. 2
      board/bf527-ezkit/video.c
  4. 2
      board/bf533-stamp/video.c
  5. 2
      board/bf548-ezkit/video.c
  6. 2
      board/cm-bf548/video.c
  7. 2
      board/kosagi/novena/novena.c
  8. 2
      board/mpl/common/kbd.c
  9. 2
      board/mpl/pati/pati.c
  10. 3
      common/cmd_console.c
  11. 4
      common/stdio.c
  12. 2
      common/usb_kbd.c
  13. 2
      drivers/input/cros_ec_keyb.c
  14. 2
      drivers/input/keyboard.c
  15. 2
      drivers/input/tegra-kbc.c
  16. 2
      drivers/net/netconsole.c
  17. 3
      drivers/video/cfb_console.c
  18. 2
      include/stdio_dev.h

2
arch/blackfin/cpu/jtag-console.c
Unescape View File

@ -183,7 +183,7 @@ int drv_jtag_console_init(void)
memset(&dev, 0x00, sizeof(dev));
strcpy(dev.name, "jtag");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.putc = jtag_putc;
dev.puts = jtag_puts;
dev.tstc = jtag_tstc;

1
arch/powerpc/cpu/mpc8xx/video.c
Unescape View File

@ -1089,7 +1089,6 @@ int drv_video_init (void)
memset (&videodev, 0, sizeof (videodev));
strcpy (videodev.name, "video");
videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
videodev.flags = DEV_FLAGS_OUTPUT; /* Output only */
videodev.putc = video_putc; /* 'putc' function */
videodev.puts = video_puts; /* 'puts' function */

2
board/bf527-ezkit/video.c
Unescape View File

@ -438,8 +438,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);

2
board/bf533-stamp/video.c
Unescape View File

@ -164,8 +164,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
videodev.ext = DEV_EXT_VIDEO;
videodev.flags = DEV_FLAGS_SYSTEM;
return stdio_register(&videodev);
}

2
board/bf548-ezkit/video.c
Unescape View File

@ -328,8 +328,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);

2
board/cm-bf548/video.c
Unescape View File

@ -332,8 +332,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);

2
board/kosagi/novena/novena.c
Unescape View File

@ -77,7 +77,7 @@ int drv_keyboard_init(void)
int error;
struct stdio_dev dev = {
.name = "button",
.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM,
.flags = DEV_FLAGS_INPUT,
.start = novena_gpio_button_init,
.getc = novena_gpio_button_getc,
.tstc = novena_gpio_button_tstc,

2
board/mpl/common/kbd.c
Unescape View File

@ -203,7 +203,7 @@ int drv_isa_kbd_init (void)
return -1;
memset (&kbddev, 0, sizeof(kbddev));
strcpy(kbddev.name, DEVNAME);
kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
kbddev.flags = DEV_FLAGS_INPUT;
kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ;

2
board/mpl/pati/pati.c
Unescape View File

@ -566,7 +566,7 @@ void pci_con_connect(void)
irq_install_handler (0x2, (interrupt_handler_t *) pci_dorbell_irq,NULL);
memset (&pci_con_dev, 0, sizeof (pci_con_dev));
strcpy (pci_con_dev.name, "pci_con");
pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
pci_con_dev.putc = pci_con_putc;
pci_con_dev.puts = pci_con_puts;
pci_con_dev.getc = pci_con_getc;

3
common/cmd_console.c
Unescape View File

@ -27,10 +27,9 @@ static int do_coninfo(cmd_tbl_t *cmd, int flag, int argc, char * const argv[])
list_for_each(pos, list) {
dev = list_entry(pos, struct stdio_dev, list);
printf ("%-8s %08x %c%c%c ",
printf ("%-8s %08x %c%c ",
dev->name,
dev->flags,
(dev->flags & DEV_FLAGS_SYSTEM) ? 'S' : '.',
(dev->flags & DEV_FLAGS_INPUT) ? 'I' : '.',
(dev->flags & DEV_FLAGS_OUTPUT) ? 'O' : '.');

4
common/stdio.c
Unescape View File

@ -88,7 +88,7 @@ static void drv_system_init (void)
memset (&dev, 0, sizeof (dev));
strcpy (dev.name, "serial");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.putc = stdio_serial_putc;
dev.puts = stdio_serial_puts;
dev.getc = stdio_serial_getc;
@ -99,7 +99,7 @@ static void drv_system_init (void)
memset (&dev, 0, sizeof (dev));
strcpy (dev.name, "nulldev");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.putc = nulldev_putc;
dev.puts = nulldev_puts;
dev.getc = nulldev_input;

2
common/usb_kbd.c
Unescape View File

@ -503,7 +503,7 @@ static int probe_usb_keyboard(struct usb_device *dev)
debug("USB KBD: register.\n");
memset(&usb_kbd_dev, 0, sizeof(struct stdio_dev));
strcpy(usb_kbd_dev.name, DEVNAME);
usb_kbd_dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
usb_kbd_dev.flags = DEV_FLAGS_INPUT;
usb_kbd_dev.getc = usb_kbd_getc;
usb_kbd_dev.tstc = usb_kbd_testc;
usb_kbd_dev.priv = (void *)dev;

2
drivers/input/cros_ec_keyb.c
Unescape View File

@ -258,7 +258,7 @@ int drv_keyboard_init(void)
memset(&dev, '\0', sizeof(dev));
strcpy(dev.name, "cros-ec-keyb");
dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_INPUT;
dev.getc = kbd_getc;
dev.tstc = kbd_tstc;
dev.start = cros_ec_init_keyboard;

2
drivers/input/keyboard.c
Unescape View File

@ -274,7 +274,7 @@ int kbd_init (void)
return -1;
memset (&kbddev, 0, sizeof(kbddev));
strcpy(kbddev.name, DEVNAME);
kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
kbddev.flags = DEV_FLAGS_INPUT;
kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ;

2
drivers/input/tegra-kbc.c
Unescape View File

@ -358,7 +358,7 @@ int drv_keyboard_init(void)
memset(&dev, '\0', sizeof(dev));
strcpy(dev.name, "tegra-kbc");
dev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_INPUT;
dev.getc = kbd_getc;
dev.tstc = kbd_tstc;
dev.start = init_tegra_keyboard;

2
drivers/net/netconsole.c
Unescape View File

@ -330,7 +330,7 @@ int drv_nc_init(void)
memset(&dev, 0, sizeof(dev));
strcpy(dev.name, "nc");
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
dev.start = nc_stdio_start;
dev.putc = nc_stdio_putc;
dev.puts = nc_stdio_puts;

3
drivers/video/cfb_console.c
Unescape View File

@ -2280,8 +2280,7 @@ int drv_video_init(void)
/* Init vga device */
memset(&console_dev, 0, sizeof(console_dev));
strcpy(console_dev.name, "vga");
console_dev.ext = DEV_EXT_VIDEO; /* Video extensions */
console_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_SYSTEM;
console_dev.flags = DEV_FLAGS_OUTPUT;
console_dev.putc = video_putc; /* 'putc' function */
console_dev.puts = video_puts; /* 'puts' function */

2
include/stdio_dev.h
Unescape View File

@ -16,8 +16,6 @@
#define DEV_FLAGS_INPUT 0x00000001 /* Device can be used as input console */
#define DEV_FLAGS_OUTPUT 0x00000002 /* Device can be used as output console */
#define DEV_FLAGS_SYSTEM 0x80000000 /* Device is a system device */
#define DEV_EXT_VIDEO 0x00000001 /* Video extensions supported */
/* Device information */
struct stdio_dev {

Write Preview
Loading…
Cancel
Save