summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2014-11-26 10:37:58 +0100
commitebeaa953a3a6ae98842b4a169bc95e5f3c673d8c (patch)
tree41959790c00308fc3cac9c71176709f53683151d /src/osd
parent18b8ce2f9467ae23672cea11f4a3fc5e42e24b9c (diff)
Cleanups and version bumpmame0156
Diffstat (limited to 'src/osd')
-rw-r--r--src/osd/modules/debugger/qt/debugqtdasmwindow.c8
-rw-r--r--src/osd/modules/debugger/qt/debugqtlogwindow.c4
-rw-r--r--src/osd/modules/debugger/qt/debugqtmainwindow.c12
-rw-r--r--src/osd/modules/debugger/qt/debugqtmainwindow.h8
-rw-r--r--src/osd/modules/debugger/qt/debugqtmemorywindow.c14
-rw-r--r--src/osd/modules/debugger/qt/debugqtview.c14
-rw-r--r--src/osd/modules/debugger/qt/debugqtview.h4
-rw-r--r--src/osd/osdnet.c7
8 files changed, 35 insertions, 36 deletions
diff --git a/src/osd/modules/debugger/qt/debugqtdasmwindow.c b/src/osd/modules/debugger/qt/debugqtdasmwindow.c
index 150699e41bf..ca9a5045d69 100644
--- a/src/osd/modules/debugger/qt/debugqtdasmwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtdasmwindow.c
@@ -38,8 +38,8 @@ DasmWindow::DasmWindow(running_machine* machine, QWidget* parent) :
// The main disasm window
m_dasmView = new DebuggerView(DVT_DISASSEMBLY,
- m_machine,
- this);
+ m_machine,
+ this);
// Force a recompute of the disassembly region
downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc");
@@ -136,8 +136,8 @@ void DasmWindow::toggleBreakpointAtCursor(bool changedTo)
// Find an existing breakpoint at this address
INT32 bpindex = -1;
for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first();
- bp != NULL;
- bp = bp->next())
+ bp != NULL;
+ bp = bp->next())
{
if (address == bp->address())
{
diff --git a/src/osd/modules/debugger/qt/debugqtlogwindow.c b/src/osd/modules/debugger/qt/debugqtlogwindow.c
index fffd6f1ba0c..d9bc1e12b51 100644
--- a/src/osd/modules/debugger/qt/debugqtlogwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtlogwindow.c
@@ -25,8 +25,8 @@ LogWindow::LogWindow(running_machine* machine, QWidget* parent) :
// The main log view
m_logView = new DebuggerView(DVT_LOG,
- m_machine,
- this);
+ m_machine,
+ this);
// Layout
QVBoxLayout* vLayout = new QVBoxLayout(mainWindowFrame);
diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.c b/src/osd/modules/debugger/qt/debugqtmainwindow.c
index e997ce02fb4..4a5b9594636 100644
--- a/src/osd/modules/debugger/qt/debugqtmainwindow.c
+++ b/src/osd/modules/debugger/qt/debugqtmainwindow.c
@@ -27,8 +27,8 @@ MainWindow::MainWindow(running_machine* machine, QWidget* parent) :
// The log view
m_consoleView = new DebuggerView(DVT_CONSOLE,
- m_machine,
- mainWindowFrame);
+ m_machine,
+ mainWindowFrame);
m_consoleView->setFocusPolicy(Qt::NoFocus);
m_consoleView->setPreferBottom(true);
@@ -211,8 +211,8 @@ void MainWindow::toggleBreakpointAtCursor(bool changedTo)
// Find an existing breakpoint at this address
INT32 bpindex = -1;
for (device_debug::breakpoint* bp = cpuinfo->breakpoint_first();
- bp != NULL;
- bp = bp->next())
+ bp != NULL;
+ bp = bp->next())
{
if (address == bp->address())
{
@@ -287,8 +287,8 @@ void MainWindow::executeCommand(bool withClear)
// Send along the command
debug_console_execute_command(*m_machine,
- command.toLocal8Bit().data(),
- true);
+ command.toLocal8Bit().data(),
+ true);
// Add history & set the index to be the top of the stack
addToHistory(command);
diff --git a/src/osd/modules/debugger/qt/debugqtmainwindow.h b/src/osd/modules/debugger/qt/debugqtmainwindow.h
index 828dc362919..864f1c0f662 100644
--- a/src/osd/modules/debugger/qt/debugqtmainwindow.h
+++ b/src/osd/modules/debugger/qt/debugqtmainwindow.h
@@ -78,8 +78,8 @@ public:
m_machine(machine)
{
m_dasmView = new DebuggerView(DVT_DISASSEMBLY,
- m_machine,
- this);
+ m_machine,
+ this);
// Force a recompute of the disassembly region
downcast<debug_view_disasm*>(m_dasmView->view())->set_expression("curpc");
@@ -130,8 +130,8 @@ public:
m_machine(machine)
{
m_processorView = new DebuggerView(DVT_STATE,
- m_machine,
- this);
+ m_machine,
+ this);
m_processorView->setFocusPolicy(Qt::NoFocus);
QVBoxLayout* cvLayout = new QVBoxLayout(this);
diff --git a/src/osd/modules/debugger/qt/debugqtmemorywindow.c b/src/osd/modules/debugger/qt/debugqtmemorywindow.c
index 19d107617e9..979f324801d 100644
--- a/src/osd/modules/debugger/qt/debugqtmemorywindow.c
+++ b/src/osd/modules/debugger/qt/debugqtmemorywindow.c
@@ -234,8 +234,8 @@ void MemoryWindow::populateComboBox()
m_memoryComboBox->clear();
for (const debug_view_source* source = m_memTable->view()->first_source();
- source != NULL;
- source = source->next())
+ source != NULL;
+ source = source->next())
{
m_memoryComboBox->addItem(source->name());
}
@@ -300,12 +300,12 @@ void DebuggerMemView::mousePressEvent(QMouseEvent* event)
address_space* addressSpace = source->space();
const int nativeDataWidth = addressSpace->data_width() / 8;
const UINT64 memValue = debug_read_memory(*addressSpace,
- addressSpace->address_to_byte(address),
- nativeDataWidth,
- true);
+ addressSpace->address_to_byte(address),
+ nativeDataWidth,
+ true);
const offs_t pc = source->device()->debug()->track_mem_pc_from_space_address_data(addressSpace->spacenum(),
- address,
- memValue);
+ address,
+ memValue);
if (pc != (offs_t)(-1))
{
// TODO: You can specify a box that the tooltip stays alive within - might be good?
diff --git a/src/osd/modules/debugger/qt/debugqtview.c b/src/osd/modules/debugger/qt/debugqtview.c
index a26275f40ec..34146860f61 100644
--- a/src/osd/modules/debugger/qt/debugqtview.c
+++ b/src/osd/modules/debugger/qt/debugqtview.c
@@ -3,8 +3,8 @@
#include "debugqtview.h"
DebuggerView::DebuggerView(const debug_view_type& type,
- running_machine* machine,
- QWidget* parent) :
+ running_machine* machine,
+ QWidget* parent) :
QAbstractScrollArea(parent),
m_preferBottom(false),
m_view(NULL),
@@ -122,8 +122,8 @@ void DebuggerView::paintEvent(QPaintEvent* event)
if(textAttr & DCA_DISABLED)
{
fgColor.setRgb((fgColor.red() + bgColor.red()) >> 1,
- (fgColor.green() + bgColor.green()) >> 1,
- (fgColor.blue() + bgColor.blue()) >> 1);
+ (fgColor.green() + bgColor.green()) >> 1,
+ (fgColor.blue() + bgColor.blue()) >> 1);
}
if(textAttr & DCA_COMMENT)
{
@@ -141,8 +141,8 @@ void DebuggerView::paintEvent(QPaintEvent* event)
// There is a touchy interplay between font height, drawing difference, visible position, etc
// Fonts don't get drawn "down and to the left" like boxes, so some wiggling is needed.
painter.drawText(x*fontWidth,
- (y*fontHeight + (fontHeight*0.80)),
- QString(m_view->viewdata()[viewDataOffset].byte));
+ (y*fontHeight + (fontHeight*0.80)),
+ QString(m_view->viewdata()[viewDataOffset].byte));
viewDataOffset++;
}
}
@@ -254,7 +254,7 @@ void DebuggerView::paintEvent(QPaintEvent* event)
break;
text.append(QChar(viewdata[viewDataOffset + width].byte));
}
-
+
// Your characters are not guaranteed to take up the entire length x fontWidth x fontHeight, so fill before.
painter.fillRect(x*fontWidth, y*fontHeight, width*fontWidth, fontHeight, bgBrush);
diff --git a/src/osd/modules/debugger/qt/debugqtview.h b/src/osd/modules/debugger/qt/debugqtview.h
index fd78760d169..16ce1f48fbd 100644
--- a/src/osd/modules/debugger/qt/debugqtview.h
+++ b/src/osd/modules/debugger/qt/debugqtview.h
@@ -12,8 +12,8 @@ class DebuggerView : public QAbstractScrollArea
public:
DebuggerView(const debug_view_type& type,
- running_machine* machine,
- QWidget* parent=NULL);
+ running_machine* machine,
+ QWidget* parent=NULL);
virtual ~DebuggerView();
void paintEvent(QPaintEvent* event);
diff --git a/src/osd/osdnet.c b/src/osd/osdnet.c
index 2af841c0c2b..b727e6b676f 100644
--- a/src/osd/osdnet.c
+++ b/src/osd/osdnet.c
@@ -119,13 +119,12 @@ void osd_list_network_adapters(void)
printf("Available network adapters:\n");
const netdev_entry_t *entry = netdev_first();
- while(entry) {
- printf(" %s\n", entry->description);
+ while(entry) {
+ printf(" %s\n", entry->description);
entry = entry->m_next;
}
-
+
#else
printf("Network is not supported in this build\n");
#endif
}
-