[prev in list] [next in list] [prev in thread] [next in thread]
List: haiku-commits
Subject: [haiku-commits] Change in haiku[master]: kernel/arch/arm: enable 8250 generic and OMAP UART drivers
From: Gerrit <review () review ! haiku-os ! org>
Date: 2021-11-28 15:16:05
Message-ID: gerrit.1638112555000.I45396eada2e9088b27df7fb9522d07e8ac223fd5 () review ! haiku-os ! org
[Download RAW message or body]
From <karolyd577@gmail.com>:
karolyd577@gmail.com has uploaded this change for review. ( \
https://review.haiku-os.org/c/haiku/+/4741 )
Change subject: kernel/arch/arm: enable 8250 generic and OMAP UART drivers
......................................................................
kernel/arch/arm: enable 8250 generic and OMAP UART drivers
Change-Id: I45396eada2e9088b27df7fb9522d07e8ac223fd5
---
M headers/private/kernel/arch/arm/arch_uart_8250_omap.h
M src/system/kernel/arch/arm/arch_debug_console.cpp
2 files changed, 13 insertions(+), 1 deletion(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/41/4741/1
diff --git a/headers/private/kernel/arch/arm/arch_uart_8250_omap.h \
b/headers/private/kernel/arch/arm/arch_uart_8250_omap.h index 6bc65bc..643b743 100644
--- a/headers/private/kernel/arch/arm/arch_uart_8250_omap.h
+++ b/headers/private/kernel/arch/arm/arch_uart_8250_omap.h
@@ -17,6 +17,9 @@
#include <arch/generic/debug_uart.h>
+#define UART_KIND_8250_OMAP "8250-omap"
+
+
class ArchUART8250Omap : public DebugUART8250 {
public:
ArchUART8250Omap(addr_t base, int64 clock);
diff --git a/src/system/kernel/arch/arm/arch_debug_console.cpp \
b/src/system/kernel/arch/arm/arch_debug_console.cpp index 8e6a22e..8c6f259 100644
--- a/src/system/kernel/arch/arm/arch_debug_console.cpp
+++ b/src/system/kernel/arch/arm/arch_debug_console.cpp
@@ -12,6 +12,8 @@
#include <arch/debug_console.h>
#include <arch/generic/debug_uart.h>
+#include <arch/generic/debug_uart_8250.h>
+#include <arch/arm/arch_uart_8250_omap.h>
#include <arch/arm/arch_uart_pl011.h>
#include <boot/kernel_args.h>
#include <kernel.h>
@@ -98,11 +100,18 @@
status_t
arch_debug_console_init(kernel_args *args)
{
- //TODO: add initialiation for other UART types e.g. 8250
if (strncmp(args->arch_args.uart.kind, UART_KIND_PL011,
sizeof(args->arch_args.uart.kind)) == 0) {
sArchDebugUART = arch_get_uart_pl011(args->arch_args.uart.regs.start,
args->arch_args.uart.clock);
+ } else if (strncmp(args->arch_args.uart.kind, UART_KIND_8250_OMAP,
+ sizeof(args->arch_args.uart.kind)) == 0) {
+ sArchDebugUART = arch_get_uart_8250_omap(args->arch_args.uart.regs.start,
+ args->arch_args.uart.clock);
+ } else if (strncmp(args->arch_args.uart.kind, UART_KIND_8250,
+ sizeof(args->arch_args.uart.kind)) == 0) {
+ sArchDebugUART = arch_get_uart_8250(args->arch_args.uart.regs.start,
+ args->arch_args.uart.clock);
}
// As a last try, lets assume qemu's pl011 at a sane address
--
To view, visit https://review.haiku-os.org/c/haiku/+/4741
To unsubscribe, or for help writing mail filters, visit \
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I45396eada2e9088b27df7fb9522d07e8ac223fd5
Gerrit-Change-Number: 4741
Gerrit-PatchSet: 1
Gerrit-Owner: karolyd577@gmail.com
Gerrit-MessageType: newchange
[Attachment #3 (text/html)]
<p>karolyd577@gmail.com has uploaded this change for \
<strong>review</strong>.</p><p><a \
href="https://review.haiku-os.org/c/haiku/+/4741">View Change</a></p><pre \
style="font-family: monospace,monospace; white-space: pre-wrap;">kernel/arch/arm: \
enable 8250 generic and OMAP UART drivers<br><br>Change-Id: \
I45396eada2e9088b27df7fb9522d07e8ac223fd5<br>---<br>M \
headers/private/kernel/arch/arm/arch_uart_8250_omap.h<br>M \
src/system/kernel/arch/arm/arch_debug_console.cpp<br>2 files changed, 13 \
insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: \
monospace,monospace; white-space: pre-wrap;">git pull ssh://git.haiku-os.org:22/haiku \
refs/changes/41/4741/1</pre><pre style="font-family: monospace,monospace; \
white-space: pre-wrap;"><span>diff --git \
a/headers/private/kernel/arch/arm/arch_uart_8250_omap.h \
b/headers/private/kernel/arch/arm/arch_uart_8250_omap.h</span><br><span>index \
6bc65bc..643b743 100644</span><br><span>--- \
a/headers/private/kernel/arch/arm/arch_uart_8250_omap.h</span><br><span>+++ \
b/headers/private/kernel/arch/arm/arch_uart_8250_omap.h</span><br><span>@@ -17,6 \
+17,9 @@</span><br><span> #include <arch/generic/debug_uart.h></span><br><span> \
</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define \
UART_KIND_8250_OMAP "8250-omap"</span><br><span style="color: hsl(120, \
100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> \
class ArchUART8250Omap : public DebugUART8250 {</span><br><span> \
public:</span><br><span> ArchUART8250Omap(addr_t base, int64 \
clock);</span><br><span>diff --git \
a/src/system/kernel/arch/arm/arch_debug_console.cpp \
b/src/system/kernel/arch/arm/arch_debug_console.cpp</span><br><span>index \
8e6a22e..8c6f259 100644</span><br><span>--- \
a/src/system/kernel/arch/arm/arch_debug_console.cpp</span><br><span>+++ \
b/src/system/kernel/arch/arm/arch_debug_console.cpp</span><br><span>@@ -12,6 +12,8 \
@@</span><br><span> </span><br><span> #include \
<arch/debug_console.h></span><br><span> #include \
<arch/generic/debug_uart.h></span><br><span style="color: hsl(120, 100%, \
40%);">+#include <arch/generic/debug_uart_8250.h></span><br><span style="color: \
hsl(120, 100%, 40%);">+#include \
<arch/arm/arch_uart_8250_omap.h></span><br><span> #include \
<arch/arm/arch_uart_pl011.h></span><br><span> #include \
<boot/kernel_args.h></span><br><span> #include \
<kernel.h></span><br><span>@@ -98,11 +100,18 @@</span><br><span> \
status_t</span><br><span> arch_debug_console_init(kernel_args *args)</span><br><span> \
{</span><br><span style="color: hsl(0, 100%, 40%);">- //TODO: add initialiation for \
other UART types e.g. 8250</span><br><span> if \
(strncmp(args->arch_args.uart.kind, UART_KIND_PL011,</span><br><span> \
sizeof(args->arch_args.uart.kind)) == 0) {</span><br><span> sArchDebugUART = \
arch_get_uart_pl011(args->arch_args.uart.regs.start,</span><br><span> \
args->arch_args.uart.clock);</span><br><span style="color: hsl(120, 100%, \
40%);">+ } else if (strncmp(args->arch_args.uart.kind, \
UART_KIND_8250_OMAP,</span><br><span style="color: hsl(120, 100%, \
40%);">+ sizeof(args->arch_args.uart.kind)) == 0) {</span><br><span style="color: \
hsl(120, 100%, 40%);">+ sArchDebugUART = \
arch_get_uart_8250_omap(args->arch_args.uart.regs.start,</span><br><span \
style="color: hsl(120, 100%, \
40%);">+ args->arch_args.uart.clock);</span><br><span style="color: hsl(120, \
100%, 40%);">+ } else if (strncmp(args->arch_args.uart.kind, \
UART_KIND_8250,</span><br><span style="color: hsl(120, 100%, \
40%);">+ sizeof(args->arch_args.uart.kind)) == 0) {</span><br><span style="color: \
hsl(120, 100%, 40%);">+ sArchDebugUART = \
arch_get_uart_8250(args->arch_args.uart.regs.start,</span><br><span style="color: \
hsl(120, 100%, 40%);">+ args->arch_args.uart.clock);</span><br><span> \
}</span><br><span> </span><br><span> // As a last try, lets assume qemu's pl011 \
at a sane address</span><br><span></span><br></pre><p>To view, visit <a \
href="https://review.haiku-os.org/c/haiku/+/4741">change 4741</a>. To unsubscribe, or \
for help writing mail filters, visit <a \
href="https://review.haiku-os.org/settings">settings</a>.</p><div itemscope \
itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" \
itemtype="http://schema.org/ViewAction"><link itemprop="url" \
href="https://review.haiku-os.org/c/haiku/+/4741"/><meta itemprop="name" \
content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: haiku </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: \
I45396eada2e9088b27df7fb9522d07e8ac223fd5 </div> <div style="display:none"> \
Gerrit-Change-Number: 4741 </div> <div style="display:none"> Gerrit-PatchSet: 1 \
</div> <div style="display:none"> Gerrit-Owner: karolyd577@gmail.com </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic