Store device's names and add more startup messages
This commit is contained in:
parent
d7f354221f
commit
a64668b239
@ -113,6 +113,7 @@ int bcm2835_videocore_init_dev(struct fb *f, unsigned int color_depth) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct fb_dev videocore_dev = {
|
struct fb_dev videocore_dev = {
|
||||||
|
.name ="bcm2835_videocore",
|
||||||
.init = &bcm2835_videocore_init_dev
|
.init = &bcm2835_videocore_init_dev
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -110,6 +110,7 @@ int mini_uart_putc(char c) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct serial_dev mini_uart_dev = {
|
struct serial_dev mini_uart_dev = {
|
||||||
|
.name = "pi_mini_uart",
|
||||||
.putc = &mini_uart_putc
|
.putc = &mini_uart_putc
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -38,6 +38,7 @@ int pl011_putc(char c)
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct serial_dev pl011_dev = {
|
struct serial_dev pl011_dev = {
|
||||||
|
.name = "pl011",
|
||||||
.putc = &pl011_putc
|
.putc = &pl011_putc
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -92,6 +92,7 @@ int pl111_init_dev(struct fb *f, unsigned int color_depth) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
struct fb_dev pl111_dev = {
|
struct fb_dev pl111_dev = {
|
||||||
|
.name = "pl111",
|
||||||
.init = &pl111_init_dev
|
.init = &pl111_init_dev
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -20,11 +20,17 @@
|
|||||||
|
|
||||||
#include <list.h>
|
#include <list.h>
|
||||||
|
|
||||||
|
#ifndef SERIAL_H
|
||||||
|
#define SERIAL_H
|
||||||
|
|
||||||
struct serial_dev {
|
struct serial_dev {
|
||||||
//TODO add more functions and attributes here
|
//TODO add more functions and attributes here
|
||||||
|
char *name;
|
||||||
int (*putc)(char);
|
int (*putc)(char);
|
||||||
struct dlist_node list;
|
struct dlist_node list;
|
||||||
};
|
};
|
||||||
|
|
||||||
int serial_register_device(struct serial_dev *sdev);
|
int serial_register_device(struct serial_dev *sdev);
|
||||||
struct serial_dev *serial_first_device();
|
struct serial_dev *serial_first_device();
|
||||||
|
|
||||||
|
#endif /* SERIAL_H */
|
||||||
|
@ -38,7 +38,7 @@ void print_console_logo() {
|
|||||||
print_func(&console_putc, " / _ \\ / _ \\/ _` | '__| \\ \\/ /\n");
|
print_func(&console_putc, " / _ \\ / _ \\/ _` | '__| \\ \\/ /\n");
|
||||||
print_func(&console_putc, " / ___ \\ __/ (_| | | | |> <\n");
|
print_func(&console_putc, " / ___ \\ __/ (_| | | | |> <\n");
|
||||||
print_func(&console_putc, " /_/ \\_\\___|\\__,_|_| |_/_/\\_\\\n\n");
|
print_func(&console_putc, " /_/ \\_\\___|\\__,_|_| |_/_/\\_\\\n\n");
|
||||||
print_func(&console_putc, " Copyright (C) 2012 - Aaron Lindsay\n");
|
print_func(&console_putc, " Copyright (C) 2012 - Aaron Lindsay\n\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
void video_console_init(void) {
|
void video_console_init(void) {
|
||||||
@ -60,13 +60,18 @@ void video_console_init(void) {
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
print_console_logo();
|
print_console_logo();
|
||||||
|
|
||||||
|
print_func(&console_putc, "Successfully initialized video console on %s.\n", fbdev->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
void serial_console_init() {
|
void serial_console_init() {
|
||||||
struct serial_dev *sdev = serial_first_device();
|
struct serial_dev *sdev = serial_first_device();
|
||||||
|
|
||||||
if (sdev)
|
if (!sdev)
|
||||||
|
return;
|
||||||
|
|
||||||
print_init(sdev->putc);
|
print_init(sdev->putc);
|
||||||
|
print("Successfully initialized serial console on %s\n", sdev->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
void serial_init();
|
void serial_init();
|
||||||
@ -100,6 +105,7 @@ int main(void) {
|
|||||||
do {
|
do {
|
||||||
lower = (char *)atags->data.mem.start;
|
lower = (char *)atags->data.mem.start;
|
||||||
upper = lower + atags->data.mem.size - 1;
|
upper = lower + atags->data.mem.size - 1;
|
||||||
|
print("atags: physical memory at %x-%x\n", lower, upper);
|
||||||
declare_memory_region(lower, upper);
|
declare_memory_region(lower, upper);
|
||||||
} while (!atags_next_mem_region(&atags));
|
} while (!atags_next_mem_region(&atags));
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user