Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uart: Style Cleanup, no functional change

Browse Source
This commit is contained in:
Alexander von Gluck IV 2012-05-17 03:31:02 -05:00
parent 182643f763
commit eb93f2661d
5 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
headers/private/kernel/arch/arm/arch_uart_pl011.h
View File

@ -10,33 +10,37 @@
#include <sys/types.h>
#include <SupportDefs.h>
#include <arch/generic/debug_uart.h>
class ArchUARTPL011 : public DebugUART {
public:
ArchUARTPL011(addr_t base, int64 clock);
~ArchUARTPL011();
void InitEarly();
void InitPort(uint32 baud);
void InitEarly();
void InitPort(uint32 baud);
void Enable();
void Disable();
void Enable();
void Disable();
int PutChar(char c);
int GetChar(bool wait);
int PutChar(char c);
int GetChar(bool wait);
void FlushTx();
void FlushRx();
void FlushTx();
void FlushRx();
private:
void Out32(int reg, uint32 value);
uint32 In32(int reg);
virtual void Barrier();
void Out32(int reg, uint32 value);
uint32 In32(int reg);
virtual void Barrier();
};
ArchUARTPL011 *arch_get_uart_pl011(addr_t base, int64 clock);
#endif

39
headers/private/kernel/arch/generic/debug_uart.h
View File

@ -9,9 +9,10 @@
#define _KERNEL_ARCH_DEBUG_UART_H
#include <SupportDefs.h>
#include <sys/types.h>
#include <SupportDefs.h>
class DebugUART {
public:
@ -21,35 +22,35 @@ public:
fEnabled(true) {};
~DebugUART() {};
virtual void InitEarly() {};
virtual void Init() {};
virtual void InitPort(uint32 baud) {};
virtual void InitEarly() {};
virtual void Init() {};
virtual void InitPort(uint32 baud) {};
virtual void Enable() { fEnabled = true; }
virtual void Disable() { fEnabled = false; }
virtual void Enable() { fEnabled = true; }
virtual void Disable() { fEnabled = false; }
virtual int PutChar(char c) = 0;
virtual int GetChar(bool wait) = 0;
virtual int PutChar(char c) = 0;
virtual int GetChar(bool wait) = 0;
virtual void FlushTx() = 0;
virtual void FlushRx() = 0;
virtual void FlushTx() = 0;
virtual void FlushRx() = 0;
addr_t Base() const { return fBase; }
int64 Clock() const { return fClock; }
bool Enabled() const { return fEnabled; }
addr_t Base() const { return fBase; }
int64 Clock() const { return fClock; }
bool Enabled() const { return fEnabled; }
protected:
// default MMIO
virtual void Out8(int reg, uint8 value)
virtual void Out8(int reg, uint8 value)
{ *((uint8 *)Base() + reg) = value; }
virtual uint8 In8(int reg)
virtual uint8 In8(int reg)
{ return *((uint8 *)Base() + reg); }
virtual void Barrier() {}
virtual void Barrier() {}
private:
addr_t fBase;
int64 fClock;
bool fEnabled;
addr_t fBase;
int64 fClock;
bool fEnabled;
};

18
headers/private/kernel/arch/generic/debug_uart_8250.h
View File

@ -9,9 +9,10 @@
#define _KERNEL_ARCH_DEBUG_UART_8250_H
#include <SupportDefs.h>
#include <sys/types.h>
#include <SupportDefs.h>
#include "debug_uart.h"
@ -20,18 +21,19 @@ public:
DebugUART8250(addr_t base, int64 clock);
~DebugUART8250();
void InitEarly();
void Init();
void InitPort(uint32 baud);
void InitEarly();
void Init();
void InitPort(uint32 baud);
int PutChar(char c);
int GetChar(bool wait);
int PutChar(char c);
int GetChar(bool wait);
void FlushTx();
void FlushRx();
void FlushTx();
void FlushRx();
};
extern DebugUART8250 *arch_get_uart_8250(addr_t base, int64 clock);
#endif /* _KERNEL_ARCH_DEBUG_UART_8250_H */

4
src/system/kernel/arch/arm/arch_uart_8250.cpp
View File

@ -34,6 +34,7 @@ ArchUART8250::~ArchUART8250()
{
}
void
ArchUART8250::InitEarly()
{
@ -55,6 +56,8 @@ ArchUART8250::InitEarly()
#warning INTITIALIZE UART!!!!!
#endif
}
void
ArchUART8250::Out8(int reg, uint8 value)
{
@ -75,4 +78,3 @@ DebugUART8250 *arch_get_uart_8250(addr_t base, int64 clock)
ArchUART8250 *uart = new(buffer) ArchUART8250(base, clock);
return uart;
}

2
src/system/kernel/arch/arm/arch_uart_pl011.cpp
View File

@ -210,8 +210,6 @@ ArchUARTPL011::Barrier()
}
void
ArchUARTPL011::InitPort(uint32 baud)
{