On 2016-10-21 23:36, [email protected] wrote: > From: Andreas Kölbl <[email protected]> > > All configuration parameters for serial drivers are prefixed by CONFIF_UART_*, > except of OXPCIE952. In order to get consistency, CONFIG_UART_OXPCIE952 should > be renamed to CONFIG_SERIAL_OXPCIE952
Applying because this is a valid cleanup. But I hope we can actually get rid of this switch on the long run. For the core, debug_console should take a divider as parameter (requires some own struct jailhouse_debug_console). And the inmates are probably better off when we introduce "serial_base" and "serial_divider" command line parameters. Thanks, Jan > > Signed-off-by: Andreas Kölbl <[email protected]> > --- > hypervisor/arch/x86/dbg-write.c | 2 +- > inmates/demos/x86/32-bit-demo.c | 2 +- > inmates/demos/x86/apic-demo.c | 2 +- > inmates/demos/x86/e1000-demo.c | 2 +- > inmates/demos/x86/ioapic-demo.c | 2 +- > inmates/demos/x86/pci-demo.c | 2 +- > inmates/demos/x86/smp-demo.c | 2 +- > inmates/demos/x86/tiny-demo.c | 2 +- > inmates/lib/x86/printk.c | 2 +- > 9 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hypervisor/arch/x86/dbg-write.c b/hypervisor/arch/x86/dbg-write.c > index fdbe95a..045ce65 100644 > --- a/hypervisor/arch/x86/dbg-write.c > +++ b/hypervisor/arch/x86/dbg-write.c > @@ -89,7 +89,7 @@ static void uart_init(void) > } > > uart_reg_out(UART_LCR, UART_LCR_DLAB); > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > outb(0x22, uart_base + UART_DLL); > #else > uart_reg_out(UART_DLL, 1); > diff --git a/inmates/demos/x86/32-bit-demo.c b/inmates/demos/x86/32-bit-demo.c > index c0dc5a7..e95c7e9 100644 > --- a/inmates/demos/x86/32-bit-demo.c > +++ b/inmates/demos/x86/32-bit-demo.c > @@ -15,7 +15,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/demos/x86/apic-demo.c b/inmates/demos/x86/apic-demo.c > index 57f8975..272a5d1 100644 > --- a/inmates/demos/x86/apic-demo.c > +++ b/inmates/demos/x86/apic-demo.c > @@ -17,7 +17,7 @@ CMDLINE_BUFFER(CMDLINE_BUFFER_SIZE); > > #define POLLUTE_CACHE_SIZE (512 * 1024) > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe010 > #else > #define UART_BASE 0x3f8 > diff --git a/inmates/demos/x86/e1000-demo.c b/inmates/demos/x86/e1000-demo.c > index e60152f..33b353b 100644 > --- a/inmates/demos/x86/e1000-demo.c > +++ b/inmates/demos/x86/e1000-demo.c > @@ -17,7 +17,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/demos/x86/ioapic-demo.c b/inmates/demos/x86/ioapic-demo.c > index 9357a1b..28023fd 100644 > --- a/inmates/demos/x86/ioapic-demo.c > +++ b/inmates/demos/x86/ioapic-demo.c > @@ -22,7 +22,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/demos/x86/pci-demo.c b/inmates/demos/x86/pci-demo.c > index fb85bc2..5f00d31 100644 > --- a/inmates/demos/x86/pci-demo.c > +++ b/inmates/demos/x86/pci-demo.c > @@ -17,7 +17,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/demos/x86/smp-demo.c b/inmates/demos/x86/smp-demo.c > index a5567be..29c509d 100644 > --- a/inmates/demos/x86/smp-demo.c > +++ b/inmates/demos/x86/smp-demo.c > @@ -12,7 +12,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/demos/x86/tiny-demo.c b/inmates/demos/x86/tiny-demo.c > index 8e1a077..0c00d91 100644 > --- a/inmates/demos/x86/tiny-demo.c > +++ b/inmates/demos/x86/tiny-demo.c > @@ -12,7 +12,7 @@ > > #include <inmate.h> > > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > #define UART_BASE 0xe000 > #else > #define UART_BASE 0x2f8 > diff --git a/inmates/lib/x86/printk.c b/inmates/lib/x86/printk.c > index 78271e1..d5451eb 100644 > --- a/inmates/lib/x86/printk.c > +++ b/inmates/lib/x86/printk.c > @@ -52,7 +52,7 @@ void printk(const char *fmt, ...) > if (!inited) { > inited = true; > outb(UART_LCR_DLAB, printk_uart_base + UART_LCR); > -#ifdef CONFIG_UART_OXPCIE952 > +#ifdef CONFIG_SERIAL_OXPCIE952 > outb(0x22, printk_uart_base + UART_DLL); > #else > outb(1, printk_uart_base + UART_DLL); > -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
