Style fixes to various parts of the system.

Signed-off-by: Adrien Destugues <[email protected]>

This patch was never applied after GSoC 2012. Rebase the parts that
still apply so we can close the ticket.

Fixes #9490.
This commit is contained in:
Freeman Lou
2017-01-29 22:47:28 +01:00
committed by Adrien Destugues
parent c7fabe22b4
commit aa3083e086
13 changed files with 170 additions and 155 deletions
-1
View File
@@ -26,7 +26,6 @@ CatchUpAnalyser::CatchUpAnalyser(const BVolume& volume, time_t start,
time_t end, BHandler* manager) time_t end, BHandler* manager)
: :
AnalyserDispatcher("CatchUpAnalyser"), AnalyserDispatcher("CatchUpAnalyser"),
fVolume(volume), fVolume(volume),
fStart(start), fStart(start),
fEnd(end), fEnd(end),
-1
View File
@@ -76,7 +76,6 @@ AnalyserMonitorHandler::AddOnDisabled(const add_on_entry_info* entryInfo)
IndexServer::IndexServer() IndexServer::IndexServer()
: :
BApplication("application/x-vnd.Haiku-index_server"), BApplication("application/x-vnd.Haiku-index_server"),
fVolumeObserverHandler(this), fVolumeObserverHandler(this),
fAddOnMonitorHandler(this), fAddOnMonitorHandler(this),
fPulseRunner(NULL) fPulseRunner(NULL)
+4 -2
View File
@@ -50,7 +50,8 @@ static const char *kRelocations[] = {
"R_ARM_TLS_DESC", //13 Dynamic Data "R_ARM_TLS_DESC", //13 Dynamic Data
"R_ARM_THM_SWI8", //14 Obsolete "R_ARM_THM_SWI8", //14 Obsolete
"R_ARM_XPC25", //15 Obsolete "R_ARM_XPC25", //15 Obsolete
"R_ARM_THM_XPC22", //16 Obsolete Encodings reserved for future Dynamic relocations "R_ARM_THM_XPC22", //16 Obsolete Encodings reserved for future
// Dynamic relocations
"R_ARM_TLS_DTPMOD32", //17 Dynamic Data Module[S] "R_ARM_TLS_DTPMOD32", //17 Dynamic Data Module[S]
"R_ARM_TLS_DTPOFF32", //18 Dynamic Data S + A ? TLS "R_ARM_TLS_DTPOFF32", //18 Dynamic Data S + A ? TLS
"R_ARM_TLS_TPOFF32", //19 Dynamic Data S + A ? tp "R_ARM_TLS_TPOFF32", //19 Dynamic Data S + A ? tp
@@ -68,7 +69,8 @@ static const char *kRelocations[] = {
"R_ARM_BASE_ABS", //31 Static Data B(S) + A "R_ARM_BASE_ABS", //31 Static Data B(S) + A
"R_ARM_ALU_PCREL_7_0", //32 Obsolete "R_ARM_ALU_PCREL_7_0", //32 Obsolete
"R_ARM_ALU_PCREL_15_8", //33 Obsolete "R_ARM_ALU_PCREL_15_8", //33 Obsolete
"R_ARM_ALU_PCREL_23_15", //34 Obsolete Note ? Legacy (ARM ELF B02) names have been retained for these obsolete relocations. "R_ARM_ALU_PCREL_23_15", //34 Obsolete Note ? Legacy (ARM ELF B02)
// names have been retained for these obsolete relocations.
"R_ARM_LDR_SBREL_11_0_NC", //35 Deprecated ARM S + A ? B(S) "R_ARM_LDR_SBREL_11_0_NC", //35 Deprecated ARM S + A ? B(S)
"R_ARM_ALU_SBREL_19_12_NC", //36 Deprecated ARM S + A ? B(S) "R_ARM_ALU_SBREL_19_12_NC", //36 Deprecated ARM S + A ? B(S)
"R_ARM_ALU_SBREL_27_20_CK", //37 Deprecated ARM S + A ? B(S) "R_ARM_ALU_SBREL_27_20_CK", //37 Deprecated ARM S + A ? B(S)
+2 -1
View File
@@ -145,7 +145,8 @@ arch_int_init_post_vm(kernel_args *args)
B_READ_AREA | B_EXECUTE_AREA, sVectorPageArea); B_READ_AREA | B_EXECUTE_AREA, sVectorPageArea);
if (sUserVectorPageArea < 0) if (sUserVectorPageArea < 0)
panic("user vector page @ %p could not be created (%lx)!", sVectorPageAddress, sUserVectorPageArea); panic("user vector page @ %p could not be created (%lx)!",
sVectorPageAddress, sUserVectorPageArea);
// copy vectors into the newly created area // copy vectors into the newly created area
memcpy(sVectorPageAddress, &_vectors_start, VECTORPAGE_SIZE); memcpy(sVectorPageAddress, &_vectors_start, VECTORPAGE_SIZE);
@@ -27,7 +27,8 @@ public:
ArchUART8250::ArchUART8250(addr_t base, int64 clock) ArchUART8250::ArchUART8250(addr_t base, int64 clock)
: DebugUART8250(base, clock) :
DebugUART8250(base, clock)
{ {
} }
@@ -146,7 +146,8 @@
ArchUARTPL011::ArchUARTPL011(addr_t base, int64 clock) ArchUARTPL011::ArchUARTPL011(addr_t base, int64 clock)
: DebugUART(base, clock) :
DebugUART(base, clock)
{ {
Barrier(); Barrier();
@@ -27,7 +27,8 @@
DebugUART8250::DebugUART8250(addr_t base, int64 clock) DebugUART8250::DebugUART8250(addr_t base, int64 clock)
: DebugUART(base, clock) :
DebugUART(base, clock)
{ {
} }
@@ -36,6 +37,7 @@ DebugUART8250::~DebugUART8250()
{ {
} }
#define UART_RHR 0 #define UART_RHR 0
#define UART_THR 0 #define UART_THR 0
#define UART_DLL 0 #define UART_DLL 0
@@ -145,7 +145,8 @@ generic_put_physical_page(addr_t va)
desc = virtual_pmappings[va / sIOSpaceChunkSize]; desc = virtual_pmappings[va / sIOSpaceChunkSize];
if (desc == NULL) { if (desc == NULL) {
mutex_unlock(&sMutex); mutex_unlock(&sMutex);
panic("put_physical_page called on page at va 0x%lx which is not checked out\n", va); panic("put_physical_page called on page at va 0x%lx which is not checked out\n",
va);
return B_ERROR; return B_ERROR;
} }
@@ -181,10 +181,13 @@ test_gart()
addr_t base[5], physical[5]; addr_t base[5], physical[5];
allocate(aperture, 2 * B_PAGE_SIZE, 0, 0, base[0], physical[0]); allocate(aperture, 2 * B_PAGE_SIZE, 0, 0, base[0], physical[0]);
allocate(aperture, 4 * B_PAGE_SIZE, 0, B_APERTURE_NON_RESERVED, base[1], physical[1]); allocate(aperture, 4 * B_PAGE_SIZE, 0, B_APERTURE_NON_RESERVED, base[1],
allocate(aperture, 1 * B_PAGE_SIZE, 0, B_APERTURE_NEED_PHYSICAL, base[2], physical[2]); physical[1]);
allocate(aperture, 1 * B_PAGE_SIZE, 0, B_APERTURE_NEED_PHYSICAL, base[2],
physical[2]);
sGART->deallocate_memory(aperture, base[2]); sGART->deallocate_memory(aperture, base[2]);
allocate(aperture, 1 * B_PAGE_SIZE, 4 * B_PAGE_SIZE, 0, base[2], physical[2]); allocate(aperture, 1 * B_PAGE_SIZE, 4 * B_PAGE_SIZE, 0, base[2],
physical[2]);
sGART->deallocate_memory(aperture, base[1]); sGART->deallocate_memory(aperture, base[1]);
@@ -407,7 +407,8 @@ open_tty(int index, bool master)
int fd = open(path, O_RDWR | (master ? 0 : O_NOCTTY)); int fd = open(path, O_RDWR | (master ? 0 : O_NOCTTY));
if (fd < 0) { if (fd < 0) {
fprintf(stderr, "Failed to open tty `%s': %s\n", path, strerror(errno)); fprintf(stderr, "Failed to open tty `%s': %s\n", path,
strerror(errno));
exit(1); exit(1);
} }
@@ -431,7 +432,8 @@ close_tty(int &fd)
class TestUnblockOnCloseRead : public TestCase { class TestUnblockOnCloseRead : public TestCase {
public: public:
TestUnblockOnCloseRead(bool master, bool crossOver) TestUnblockOnCloseRead(bool master, bool crossOver)
: fMaster(-1), :
fMaster(-1),
fSlave(-1), fSlave(-1),
fTestMaster(master), fTestMaster(master),
fCrossOver(crossOver) fCrossOver(crossOver)
@@ -491,7 +493,8 @@ private:
class TestUnblockOnCloseWrite : public TestCase { class TestUnblockOnCloseWrite : public TestCase {
public: public:
TestUnblockOnCloseWrite(bool master, bool crossOver, bool echo) TestUnblockOnCloseWrite(bool master, bool crossOver, bool echo)
: fMaster(-1), :
fMaster(-1),
fSlave(-1), fSlave(-1),
fTestMaster(master), fTestMaster(master),
fCrossOver(crossOver), fCrossOver(crossOver),
@@ -560,7 +563,8 @@ private:
class TestSelectAlreadyReady : public TestCase { class TestSelectAlreadyReady : public TestCase {
public: public:
TestSelectAlreadyReady(bool master, bool write) TestSelectAlreadyReady(bool master, bool write)
: fMaster(-1), :
fMaster(-1),
fSlave(-1), fSlave(-1),
fTestMaster(master), fTestMaster(master),
fWrite(write) fWrite(write)
@@ -694,7 +698,8 @@ private:
class TestSelectNotifyAfterPending : public TestCase { class TestSelectNotifyAfterPending : public TestCase {
public: public:
TestSelectNotifyAfterPending(bool master, bool write, bool unblock) TestSelectNotifyAfterPending(bool master, bool write, bool unblock)
: fMaster(-1), :
fMaster(-1),
fSlave(-1), fSlave(-1),
fTestMaster(master), fTestMaster(master),
fWrite(write), fWrite(write),
@@ -808,7 +813,8 @@ private:
class TestIoctlFIONRead : public TestCase { class TestIoctlFIONRead : public TestCase {
public: public:
TestIoctlFIONRead(bool master) TestIoctlFIONRead(bool master)
: fMaster(-1), :
fMaster(-1),
fSlave(-1), fSlave(-1),
fTestMaster(master) fTestMaster(master)
{ {