summaryrefslogtreecommitdiffstats
path: root/src/devices
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/bus/bbc/1mhzbus/ieee488.cpp24
-rw-r--r--src/devices/bus/bbc/1mhzbus/ieee488.h24
-rw-r--r--src/devices/bus/hp_dio/hp98550.cpp2
-rw-r--r--src/devices/bus/sgikbd/hlekbd.h48
-rw-r--r--src/devices/cpu/m68000/m68000.h2
-rw-r--r--src/devices/cpu/mips/mips3.cpp2
-rw-r--r--src/devices/cpu/mips/o2dprintf.hxx498
-rw-r--r--src/devices/machine/dp8573.cpp2
-rw-r--r--src/devices/machine/dp8573.h164
-rw-r--r--src/devices/machine/t10sbc.cpp2
-rw-r--r--src/devices/machine/wd33c93.cpp18
-rw-r--r--src/devices/machine/wd33c93.h24
-rw-r--r--src/devices/sound/swp30.cpp15
-rw-r--r--src/devices/video/catseye.cpp4
-rw-r--r--src/devices/video/imagetek_i4100.cpp2
-rw-r--r--src/devices/video/stvvdp1.cpp2
16 files changed, 417 insertions, 416 deletions
diff --git a/src/devices/bus/bbc/1mhzbus/ieee488.cpp b/src/devices/bus/bbc/1mhzbus/ieee488.cpp
index 1b648b51a72..15f7f573ec2 100644
--- a/src/devices/bus/bbc/1mhzbus/ieee488.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ieee488.cpp
@@ -42,12 +42,12 @@ ROM_START(ieee488)
ROM_END
//ROM_START(procyon)
-// ROM_REGION(0x2000, "exp_rom", 0)
-// ROM_DEFAULT_BIOS("ieee198")
-// ROM_SYSTEM_BIOS(0, "ieee198", "IEEE 1.98")
-// ROMX_LOAD("ieee-1.98.rom", 0x0000, 0x2000, CRC(c2bbe17b) SHA1(96930b54d987dd1e4a87f546f7cd65fc1f0b9578), ROM_BIOS(0))
-// ROM_SYSTEM_BIOS(1, "ieee192", "IEEE 1.92")
-// ROMX_LOAD("ieee-1.92.rom", 0x0000, 0x2000, CRC(87e5f701) SHA1(673eab99031ca88aa90e6deade39b653f8c6b9da), ROM_BIOS(1))
+// ROM_REGION(0x2000, "exp_rom", 0)
+// ROM_DEFAULT_BIOS("ieee198")
+// ROM_SYSTEM_BIOS(0, "ieee198", "IEEE 1.98")
+// ROMX_LOAD("ieee-1.98.rom", 0x0000, 0x2000, CRC(c2bbe17b) SHA1(96930b54d987dd1e4a87f546f7cd65fc1f0b9578), ROM_BIOS(0))
+// ROM_SYSTEM_BIOS(1, "ieee192", "IEEE 1.92")
+// ROMX_LOAD("ieee-1.92.rom", 0x0000, 0x2000, CRC(87e5f701) SHA1(673eab99031ca88aa90e6deade39b653f8c6b9da), ROM_BIOS(1))
//ROM_END
//-------------------------------------------------
@@ -137,7 +137,7 @@ const tiny_rom_entry *bbc_ieee488_device::device_rom_region() const
//const tiny_rom_entry *bbc_procyon_device::device_rom_region() const
//{
-// return ROM_NAME(procyon);
+// return ROM_NAME(procyon);
//}
//**************************************************************************
@@ -166,9 +166,9 @@ bbc_b488_device::bbc_b488_device(const machine_config &mconfig, const char *tag,
}
//bbc_procyon_device::bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
-// : device_t(mconfig, BBC_PROCYON, tag, owner, clock)
-// , device_bbc_1mhzbus_interface(mconfig, *this)
-// , m_ieee(*this, IEEE488_TAG)
+// : device_t(mconfig, BBC_PROCYON, tag, owner, clock)
+// , device_bbc_1mhzbus_interface(mconfig, *this)
+// , m_ieee(*this, IEEE488_TAG)
//{
//}
@@ -258,7 +258,7 @@ WRITE8_MEMBER(bbc_b488_device::fred_w)
//if (offset >= 0x20 && offset < 0x28)
//{
- // data = mc68488_device->reg8_r(space, offset & 0x07);
+ // data = mc68488_device->reg8_r(space, offset & 0x07);
//}
//return data;
@@ -268,6 +268,6 @@ WRITE8_MEMBER(bbc_b488_device::fred_w)
//{
//if (offset >= 0x20 && offset < 0x28)
//{
- // mc68488_device->reg8_w(space, offset & 0x07, data);
+ // mc68488_device->reg8_w(space, offset & 0x07, data);
//}
//}
diff --git a/src/devices/bus/bbc/1mhzbus/ieee488.h b/src/devices/bus/bbc/1mhzbus/ieee488.h
index e1169c0d02a..05a9e60c928 100644
--- a/src/devices/bus/bbc/1mhzbus/ieee488.h
+++ b/src/devices/bus/bbc/1mhzbus/ieee488.h
@@ -79,26 +79,26 @@ private:
//class bbc_procyon_device :
-// public device_t,
-// public device_bbc_1mhzbus_interface
+// public device_t,
+// public device_bbc_1mhzbus_interface
//{
//public:
-// // construction/destruction
-// bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+// // construction/destruction
+// bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
//
//protected:
-// // device-level overrides
-// virtual void device_start() override;
+// // device-level overrides
+// virtual void device_start() override;
//
-// // optional information overrides
-// virtual void device_add_mconfig(machine_config &config) override;
-// virtual const tiny_rom_entry *device_rom_region() const override;
+// // optional information overrides
+// virtual void device_add_mconfig(machine_config &config) override;
+// virtual const tiny_rom_entry *device_rom_region() const override;
//
-// virtual DECLARE_READ8_MEMBER(fred_r) override;
-// virtual DECLARE_WRITE8_MEMBER(fred_w) override;
+// virtual DECLARE_READ8_MEMBER(fred_r) override;
+// virtual DECLARE_WRITE8_MEMBER(fred_w) override;
//
//private:
-// required_device<ieee488_device> m_ieee;
+// required_device<ieee488_device> m_ieee;
//};
diff --git a/src/devices/bus/hp_dio/hp98550.cpp b/src/devices/bus/hp_dio/hp98550.cpp
index 8ec1660d5ce..6e01255ce41 100644
--- a/src/devices/bus/hp_dio/hp98550.cpp
+++ b/src/devices/bus/hp_dio/hp98550.cpp
@@ -25,7 +25,7 @@ ROM_END
DEFINE_DEVICE_TYPE_NS(HPDIO_98550, bus::hp_dio, dio32_98550_device, "dio98550", "HP98550 high-res color DIO video card")
-namespace bus { namespace hp_dio {
+namespace bus { namespace hp_dio {
void dio32_98550_device::device_add_mconfig(machine_config &config)
{
diff --git a/src/devices/bus/sgikbd/hlekbd.h b/src/devices/bus/sgikbd/hlekbd.h
index e8e9e3cfdd7..a83268693bc 100644
--- a/src/devices/bus/sgikbd/hlekbd.h
+++ b/src/devices/bus/sgikbd/hlekbd.h
@@ -48,8 +48,8 @@ protected:
private:
enum
{
- TIMER_CLICK = 30000,
- TIMER_BEEP = 30001
+ TIMER_CLICK = 30000,
+ TIMER_BEEP = 30001
};
enum
@@ -65,8 +65,8 @@ private:
enum
{
- BEEPER_BELL = 0x01,
- BEEPER_CLICK = 0x02
+ BEEPER_BELL = 0x01,
+ BEEPER_CLICK = 0x02
};
enum
@@ -76,21 +76,21 @@ private:
enum
{
- CTRL_A_SBEEP = 1,
- CTRL_A_LBEEP = 2,
- CTRL_A_NOCLICK = 3,
- CTRL_A_RCB = 4,
- CTRL_A_NUMLK = 5,
- CTRL_A_CAPSLK = 6,
- CTRL_A_AUTOREP = 7,
-
- CTRL_B = 0,
- CTRL_B_CMPL_DS1_2 = 1,
- CTRL_B_SCRLK = 2,
- CTRL_B_L1 = 3,
- CTRL_B_L2 = 4,
- CTRL_B_L3 = 5,
- CTRL_B_L4 = 6
+ CTRL_A_SBEEP = 1,
+ CTRL_A_LBEEP = 2,
+ CTRL_A_NOCLICK = 3,
+ CTRL_A_RCB = 4,
+ CTRL_A_NUMLK = 5,
+ CTRL_A_CAPSLK = 6,
+ CTRL_A_AUTOREP = 7,
+
+ CTRL_B = 0,
+ CTRL_B_CMPL_DS1_2 = 1,
+ CTRL_B_SCRLK = 2,
+ CTRL_B_L1 = 3,
+ CTRL_B_L2 = 4,
+ CTRL_B_L3 = 5,
+ CTRL_B_L4 = 6
};
// device_buffered_serial_interface overrides
@@ -101,12 +101,12 @@ private:
required_device<beep_device> m_beeper;
output_finder<7> m_leds;
- uint8_t m_make_count;
+ uint8_t m_make_count;
- bool m_keyclick;
- bool m_auto_repeat;
- uint8_t m_beeper_state;
- uint8_t m_led_state;
+ bool m_keyclick;
+ bool m_auto_repeat;
+ uint8_t m_beeper_state;
+ uint8_t m_led_state;
};
} } // namespace bus::sgikbd
diff --git a/src/devices/cpu/m68000/m68000.h b/src/devices/cpu/m68000/m68000.h
index 2edbfa8bdf8..0596dd07976 100644
--- a/src/devices/cpu/m68000/m68000.h
+++ b/src/devices/cpu/m68000/m68000.h
@@ -292,7 +292,7 @@ protected:
uint16_t m_mmu_tmp_buserror_rw; /* temporary hack: (first) bus error rw */
uint16_t m_mmu_tmp_buserror_sz; /* temporary hack: (first) bus error size` */
- bool m_mmu_tablewalk; /* set when MMU walks page tables */
+ bool m_mmu_tablewalk; /* set when MMU walks page tables */
uint32_t m_mmu_last_logical_addr;
uint32_t m_ic_address[M68K_IC_SIZE]; /* instruction cache address data */
uint32_t m_ic_data[M68K_IC_SIZE]; /* instruction cache content data */
diff --git a/src/devices/cpu/mips/mips3.cpp b/src/devices/cpu/mips/mips3.cpp
index e04bba5d62f..8c8816b8e23 100644
--- a/src/devices/cpu/mips/mips3.cpp
+++ b/src/devices/cpu/mips/mips3.cpp
@@ -80,7 +80,7 @@
#define IS_FR1 (SR & SR_FR)
/* size of the execution code cache */
-#define DRC_CACHE_SIZE (32 * 1024 * 1024)
+#define DRC_CACHE_SIZE (32 * 1024 * 1024)
diff --git a/src/devices/cpu/mips/o2dprintf.hxx b/src/devices/cpu/mips/o2dprintf.hxx
index 6074c9d44dc..83915aed0b4 100644
--- a/src/devices/cpu/mips/o2dprintf.hxx
+++ b/src/devices/cpu/mips/o2dprintf.hxx
@@ -5,112 +5,112 @@ static char digit[] = "0123456789abcdef";
static void dprintdec(int64_t val, bool zeropad, int size)
{
- if (val == 0 && !zeropad)
- {
+ if (val == 0 && !zeropad)
+ {
printf("0");
return;
- }
+ }
- char dc[22];
- for (int rem = 0; rem < 22; rem++) dc[rem] = '0';
+ char dc[22];
+ for (int rem = 0; rem < 22; rem++) dc[rem] = '0';
- int ptr = 0;
- int64_t v = val;
- char c = ' ';
- if (val < 0)
- {
- c = '-';
- val = -val;
- }
+ int ptr = 0;
+ int64_t v = val;
+ char c = ' ';
+ if (val < 0)
+ {
+ c = '-';
+ val = -val;
+ }
int indx1 = 0;
- while (v > 10)
- {
- int64_t rem = v / 10;
- int indx = v - (rem * 10);
- dc[ptr] = digit[indx];
- v = rem;
- if (indx != 0)
- indx1 = ptr;
- ptr += 1;
- }
-
- dc[ptr] = digit[v];
-
- if (v != 0)
- indx1 = ptr; // the leading non zero digit.
-
- if (zeropad && size != 0)
- ptr = size;
- else
- ptr = indx1; // don't print leading 0s
-
- if (c == '-')
- printf("-");
-
- while (ptr >= 0)
- {
+ while (v > 10)
+ {
+ int64_t rem = v / 10;
+ int indx = v - (rem * 10);
+ dc[ptr] = digit[indx];
+ v = rem;
+ if (indx != 0)
+ indx1 = ptr;
+ ptr += 1;
+ }
+
+ dc[ptr] = digit[v];
+
+ if (v != 0)
+ indx1 = ptr; // the leading non zero digit.
+
+ if (zeropad && size != 0)
+ ptr = size;
+ else
+ ptr = indx1; // don't print leading 0s
+
+ if (c == '-')
+ printf("-");
+
+ while (ptr >= 0)
+ {
printf("%c", dc[ptr]);
- ptr -= 1;
- }
+ ptr -= 1;
+ }
}
static void dprintudec(uint64_t val, bool zeropad, int size)
{
- if (val == 0 && !zeropad)
- {
+ if (val == 0 && !zeropad)
+ {
printf("0");
return;
- }
-
- char dc[22];
- for (int rem = 0; rem < 22; dc[rem++] = '0');
-
- int ptr = 0;
- uint64_t v = val;
- int indx1 = 0;
- while (v > 10)
- {
- uint64_t rem = v / 10;
- int indx = v - (rem * 10);
- dc[ptr] = digit[indx];
- v = rem;
- if (indx != 0)
- indx1 = ptr;
- ptr += 1;
- }
-
- dc[ptr] = digit[v];
-
- if (v != 0)
- indx1 = ptr; // the leading non zero digit.
-
- if (zeropad && size != 0)
- ptr = size;
- else
- ptr = indx1; // don't print leading 0s
-
- while (ptr >= 0)
- {
- printf("%c", dc[ptr]);
- ptr -= 1;
- }
+ }
+
+ char dc[22];
+ for (int rem = 0; rem < 22; dc[rem++] = '0');
+
+ int ptr = 0;
+ uint64_t v = val;
+ int indx1 = 0;
+ while (v > 10)
+ {
+ uint64_t rem = v / 10;
+ int indx = v - (rem * 10);
+ dc[ptr] = digit[indx];
+ v = rem;
+ if (indx != 0)
+ indx1 = ptr;
+ ptr += 1;
+ }
+
+ dc[ptr] = digit[v];
+
+ if (v != 0)
+ indx1 = ptr; // the leading non zero digit.
+
+ if (zeropad && size != 0)
+ ptr = size;
+ else
+ ptr = indx1; // don't print leading 0s
+
+ while (ptr >= 0)
+ {
+ printf("%c", dc[ptr]);
+ ptr -= 1;
+ }
}
static void dprinthex(uint64_t val, bool zeropad, int pos)
{
- if (val == 0 && !zeropad)
- {
+ if (val == 0 && !zeropad)
+ {
printf("0");
return;
- }
+ }
- int pcount = pos;
- int indx = 0;
+ int pcount = pos;
+ int indx = 0;
char c;
- while (pcount >= 0)
- {
+ while (pcount >= 0)
+ {
if (pcount == 0)
c = digit[val & 0xf];
else
@@ -130,23 +130,23 @@ static void dprinthex(uint64_t val, bool zeropad, int pos)
printf("%c", c);
}
pcount -= 4;
- }
+ }
}
void dprintoct(uint64_t val, bool zeropad, int pos)
{
- if (val == 0 && !zeropad)
- {
+ if (val == 0 && !zeropad)
+ {
printf("0");
return;
- }
+ }
- int pcount = pos;
- int indx = 0;
+ int pcount = pos;
+ int indx = 0;
char c;
- while (pcount >= 0)
- {
+ while (pcount >= 0)
+ {
if (pcount == 0)
c = digit[val & 0x7];
else
@@ -179,7 +179,7 @@ static uint64_t dprintf_get_arg64(uint8_t *buf, uint32_t &curr)
{
curr = (curr + 3) & ~3;
const uint64_t ret = ((uint64_t)buf[curr+0] << 56) | ((uint64_t)buf[curr+1] << 48) | ((uint64_t)buf[curr+2] << 40) | ((uint64_t)buf[curr+3] << 32) |
- ((uint64_t)buf[curr+4] << 24) | ((uint64_t)buf[curr+5] << 16) | ((uint64_t)buf[curr+6] << 8) | buf[curr+7];
+ ((uint64_t)buf[curr+4] << 24) | ((uint64_t)buf[curr+5] << 16) | ((uint64_t)buf[curr+6] << 8) | buf[curr+7];
curr += 8;
return ret;
}
@@ -237,147 +237,147 @@ void mips3_device::do_o2_dprintf(uint32_t fmt_addr, uint32_t a1, uint32_t a2, ui
buf[idx++] = (char)byte_val;
} while(byte_val != 0);
- char *p = buf;
- char errQ[3];
- int state = 0;
- int size = 0;
- int errP = 0;
- bool zeropad = false;
- while (*p)
- {
- switch (state)
- {
- case 0:
- if (*p != '%')
- {
- printf("%c", *p);
+ char *p = buf;
+ char errQ[3];
+ int state = 0;
+ int size = 0;
+ int errP = 0;
+ bool zeropad = false;
+ while (*p)
+ {
+ switch (state)
+ {
+ case 0:
+ if (*p != '%')
+ {
+ printf("%c", *p);
+ }
+ else
+ {
+ errQ[errP++] = '%';
+ state = 1;
+ }
+ p++;
+ break;
+ case 1: // check for zero padding
+ state = 2;
+ if (*p == '0')
+ {
+ errQ[errP++] = '0';
+ zeropad = true;
+ p++;
}
- else
- {
- errQ[errP++] = '%';
- state = 1;
- }
- p++;
- break;
- case 1: // check for zero padding
- state = 2;
- if (*p == '0')
- {
- errQ[errP++] = '0';
- zeropad = true;
- p++;
- }
- else
- {
- zeropad = false;
+ else
+ {
+ zeropad = false;
}
- break;
- case 2: // check the size of the object to be printed
- state = 3;
- switch (*p)
- {
- case 'l':
- errQ[errP++] = 'l';
- size = 64;
- p++;
- break;
- case 'h':
- errQ[errP++] = 'h';
- size = 16;
- p++;
- break;
- case 'b':
- errQ[errP++] = 'b';
- size = 8;
- p++;
- break;
- default:
- size = 32;
- break;
- }
- break;
- case 3: // do the print
- switch (*p)
- {
- case '%':
- printf("%c", '%');
- break;
- case 'd':
- case 'i':
- switch (size)
- {
- case 64:
- dprintdec((int64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, 0);
- break;
- case 16: // short
- dprintdec((int64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, 4);
- break;
- case 8: // byte
- dprintdec((int64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, 3);
- break;
- default: // int
- dprintdec((int64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, 9);
- break;
- }
- break;
- case 'u':
- switch (size)
- {
- case 64:
- dprintudec((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, 0);
- break;
- case 16:
- dprintudec((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, 4);
- break;
- case 8:
- dprintudec((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, 3);
- break;
- default:
- dprintudec((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, 9);
- break;
- }
- break;
- case 'o':
- switch (size)
- {
- case 64:
- dprintoct((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, Loct);
- break;
- case 16: // short
- dprintoct((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, Soct);
- break;
- case 8: // byte
- dprintoct((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, Boct);
- break;
- default: // int
- dprintoct((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, Ioct);
- break;
- }
- break;
- case 'x':
- case 'X':
- switch (size)
- {
- case 64:
- dprinthex((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, Lhex);
- break;
- case 16:
- dprinthex((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, Shex);
- break;
- case 8:
- dprinthex((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, Bhex);
- break;
- default:
- dprinthex((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, Ihex);
- break;
- }
- break;
- case 'c':
- printf("%c", (char)dprintf_get_arg8(argbuf, argcurr));
- break;
- case 's':
- {
- uint64_t str_addr = dprintf_get_arg64(argbuf, argcurr);
+ break;
+ case 2: // check the size of the object to be printed
+ state = 3;
+ switch (*p)
+ {
+ case 'l':
+ errQ[errP++] = 'l';
+ size = 64;
+ p++;
+ break;
+ case 'h':
+ errQ[errP++] = 'h';
+ size = 16;
+ p++;
+ break;
+ case 'b':
+ errQ[errP++] = 'b';
+ size = 8;
+ p++;
+ break;
+ default:
+ size = 32;
+ break;
+ }
+ break;
+ case 3: // do the print
+ switch (*p)
+ {
+ case '%':
+ printf("%c", '%');
+ break;
+ case 'd':
+ case 'i':
+ switch (size)
+ {
+ case 64:
+ dprintdec((int64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, 0);
+ break;
+ case 16: // short
+ dprintdec((int64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, 4);
+ break;
+ case 8: // byte
+ dprintdec((int64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, 3);
+ break;
+ default: // int
+ dprintdec((int64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, 9);
+ break;
+ }
+ break;
+ case 'u':
+ switch (size)
+ {
+ case 64:
+ dprintudec((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, 0);
+ break;
+ case 16:
+ dprintudec((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, 4);
+ break;
+ case 8:
+ dprintudec((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, 3);
+ break;
+ default:
+ dprintudec((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, 9);
+ break;
+ }
+ break;
+ case 'o':
+ switch (size)
+ {
+ case 64:
+ dprintoct((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, Loct);
+ break;
+ case 16: // short
+ dprintoct((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, Soct);
+ break;
+ case 8: // byte
+ dprintoct((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, Boct);
+ break;
+ default: // int
+ dprintoct((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, Ioct);
+ break;
+ }
+ break;
+ case 'x':
+ case 'X':
+ switch (size)
+ {
+ case 64:
+ dprinthex((uint64_t)dprintf_get_arg64(argbuf, argcurr), zeropad, Lhex);
+ break;
+ case 16:
+ dprinthex((uint64_t)dprintf_get_arg16(argbuf, argcurr), zeropad, Shex);
+ break;
+ case 8:
+ dprinthex((uint64_t)dprintf_get_arg8(argbuf, argcurr), zeropad, Bhex);
+ break;
+ default:
+ dprinthex((uint64_t)dprintf_get_arg32(argbuf, argcurr), zeropad, Ihex);
+ break;
+ }
+ break;
+ case 'c':
+ printf("%c", (char)dprintf_get_arg8(argbuf, argcurr));
+ break;
+ case 's':
+ {
+ uint64_t str_addr = dprintf_get_arg64(argbuf, argcurr);
uint8_t strbyte = 0;
do
{
@@ -385,22 +385,22 @@ void mips3_device::do_o2_dprintf(uint32_t fmt_addr, uint32_t a1, uint32_t a2, ui
str_addr++;
printf("%c", (char)strbyte);
} while(strbyte);
- break;
+ break;
+ }
+ case '0': // error
+ case 'l': // error
+ case 'h': // error
+ default: // error
+ for (int i = 0; i < 3; i++)
+ printf("%c", (char)errQ[i]);
+ printf("%c", *p++);
+ break;
}
- case '0': // error
- case 'l': // error
- case 'h': // error
- default: // error
- for (int i = 0; i < 3; i++)
- printf("%c", (char)errQ[i]);
- printf("%c", *p++);
- break;
- }
- state = 0; // reset the state machine
- size = 0; // reset the size
- zeropad = false; // reset the zero padding
- errP = 0; // reset errQ
- p++;
- }
- }
+ state = 0; // reset the state machine
+ size = 0; // reset the size
+ zeropad = false; // reset the zero padding
+ errP = 0; // reset errQ
+ p++;
+ }
+ }
}
diff --git a/src/devices/machine/dp8573.cpp b/src/devices/machine/dp8573.cpp
index d40a9f49547..a9f30016ed2 100644
--- a/src/devices/machine/dp8573.cpp
+++ b/src/devices/machine/dp8573.cpp
@@ -12,7 +12,7 @@
#define LOG_GENERAL (1 << 0)
#define LOG_TICKS (1 << 1)
-#define LOG_ALL (LOG_GENERAL | LOG_TICKS)
+#define LOG_ALL (LOG_GENERAL | LOG_TICKS)
#define VERBOSE (0)
#include "logmacro.h"
diff --git a/src/devices/machine/dp8573.h b/src/devices/machine/dp8573.h
index cc4a7a32479..97b84b8a54c 100644
--- a/src/devices/machine/dp8573.h
+++ b/src/devices/machine/dp8573.h
@@ -46,90 +46,90 @@ protected:
enum
{
- REG_MSR = 0x00, // Main Status Register
- REG_RTMR = 0x01, // Not Applicable / Real-Time Mode Register
- REG_OMR = 0x02, // Not Applicable / Output Mode Register
- REG_PFR_ICR0 = 0x03, // Periodic Flag Register / Interrupt Control Register 0
- REG_TSCR_ICR1 = 0x04, // Time Save Control Register / Interrupt Control Register 1
- REG_HUNDREDTH = 0x05, // Hundredths and Teneths of a Second (0-99)
- REG_SECOND = 0x06, // Seconds (0-59)
- REG_MINUTE = 0x07, // Minutes (0-59)
- REG_HOUR = 0x08, // Hours (1-12, 0-23)
- REG_DAY = 0x09, // Day of Month (1-28/29/30/31)
- REG_MONTH = 0x0a, // Month (1-12)
- REG_YEAR = 0x0b, // Year (0-99)
+ REG_MSR = 0x00, // Main Status Register
+ REG_RTMR = 0x01, // Not Applicable / Real-Time Mode Register
+ REG_OMR = 0x02, // Not Applicable / Output Mode Register
+ REG_PFR_ICR0 = 0x03, // Periodic Flag Register / Interrupt Control Register 0
+ REG_TSCR_ICR1 = 0x04, // Time Save Control Register / Interrupt Control Register 1
+ REG_HUNDREDTH = 0x05, // Hundredths and Teneths of a Second (0-99)
+ REG_SECOND = 0x06, // Seconds (0-59)
+ REG_MINUTE = 0x07, // Minutes (0-59)
+ REG_HOUR = 0x08, // Hours (1-12, 0-23)
+ REG_DAY = 0x09, // Day of Month (1-28/29/30/31)
+ REG_MONTH = 0x0a, // Month (1-12)
+ REG_YEAR = 0x0b, // Year (0-99)
// 0x0c - RAM
- REG_RAM_D1D0 = 0x0d, // RAM, D1/D0 bits only
- REG_DAYOFWEEK = 0x0e, // Day of Week (1-7)
- REG_NA_0FH = 0x0f,
- REG_NA_10H = 0x10,
- REG_NA_11H = 0x11,
- REG_NA_12H = 0x12,
- REG_COMP_SECOND = 0x13, // Seconds Compare RAM (0-59)
- REG_COMP_MINUTE = 0x14, // Minutes Compare RAM (0-59)
- REG_COMP_HOUR = 0x15, // Hours Compare RAM (1-12, 0-23)
- REG_COMP_DAY = 0x16, // Day of Month Compare RAM (1-28/29/30/31)
- REG_COMP_MONTH = 0x17, // Month Compare RAM (1-12)
- REG_COMP_DAYOFWEEK = 0x18, // Day of Week Compare RAM (1-7)
- REG_SAVE_SECOND = 0x19, // Seconds Time Save RAM
- REG_SAVE_MINUTE = 0x1a, // Minutes Time Save RAM
- REG_SAVE_HOUR = 0x1b, // Hours Time Save RAM
- REG_SAVE_DAY = 0x1c, // Day of Month Time Save RAM
- REG_SAVE_MONTH = 0x1d, // Month Time Save RAM
+ REG_RAM_D1D0 = 0x0d, // RAM, D1/D0 bits only
+ REG_DAYOFWEEK = 0x0e, // Day of Week (1-7)
+ REG_NA_0FH = 0x0f,
+ REG_NA_10H = 0x10,
+ REG_NA_11H = 0x11,
+ REG_NA_12H = 0x12,
+ REG_COMP_SECOND = 0x13, // Seconds Compare RAM (0-59)
+ REG_COMP_MINUTE = 0x14, // Minutes Compare RAM (0-59)
+ REG_COMP_HOUR = 0x15, // Hours Compare RAM (1-12, 0-23)
+ REG_COMP_DAY = 0x16, // Day of Month Compare RAM (1-28/29/30/31)
+ REG_COMP_MONTH = 0x17, // Month Compare RAM (1-12)
+ REG_COMP_DAYOFWEEK = 0x18, // Day of Week Compare RAM (1-7)
+ REG_SAVE_SECOND = 0x19, // Seconds Time Save RAM
+ REG_SAVE_MINUTE = 0x1a, // Minutes Time Save RAM
+ REG_SAVE_HOUR = 0x1b, // Hours Time Save RAM
+ REG_SAVE_DAY = 0x1c, // Day of Month Time Save RAM
+ REG_SAVE_MONTH = 0x1d, // Month Time Save RAM
// 0x1e - RAM
- REG_TEST = 0x1f, // RAM / Test Mode Register
-
- MSR_INT = 0x01, // Interrupt Status
- MSR_PF = 0x02, // Power Fail Interrupt
- MSR_PER = 0x04, // Period Interrupt
- MSR_AL = 0x08, // Alarm Interrupt
- MSR_RS = 0x40, // Register Select Bit
- MSR_RAM_MASK = 0xf0,
- MSR_INT_MASK = 0x0e,
- MSR_CLEARABLE_MASK = 0x0c,
-
- PFR_1MIN = 0x01, // Minutes flag
- PFR_10S = 0x02, // 10-second flag
- PFR_1S = 0x04, // Seconds flag
- PFR_100MS = 0x08, // 100-millisecond flag
- PFR_10MS = 0x10, // 10-millisecond flag
- PFR_1MS = 0x20, // Millisecond flag
- PFR_OSF = 0x40, // Oscillator Failed / Single Supply Bit
- PFR_TM = 0x80, // Test Mode Enable
- PFR_READ_CLEAR_MASK = 0x3f,
-
- TSCR_RAM_MASK = 0x3f,
- TSCR_NA = 0x40, // N/A
- TSCR_TS = 0x80, // Time Save Enable
-
- RTMR_LY0 = 0x01, // Leap Year LSB
- RTMR_LY1 = 0x02, // Leap Year MSB
- RTMR_LY = 0x03,
- RTMR_12H = 0x04, // 12/!24 hour mode
- RTMR_CSS = 0x08, // Clock Start/!Stop
- RTMR_IPF = 0x10, // Interrupt PF Operation
- RTMR_RAM_MASK = 0xe0,
-
- OMR_RAM_MASK = 0x7f,
- OMR_MO = 0x80, // MFO Pin as Oscillator
-
- ICR0_MN = 0x01, // Minutes enable
- ICR0_TS = 0x02, // 10-second enable
- ICR0_S = 0x04, // Seconds enable
- ICR0_HM = 0x08, // 100 millisecond enable
- ICR0_TM = 0x10, // 10 millisecond enable
- ICR0_1M = 0x20, // Milliseconds enable
- ICR0_RAM_MASK = 0xc0,
-
- ICR1_SC = 0x01, // Second compare enable
- ICR1_MN = 0x02, // Minute compare enable
- ICR1_HR = 0x04, // Hour compare enable
- ICR1_DOM = 0x08, // Day of month compare enable
- ICR1_MO = 0x10, // Month compare enable
- ICR1_DOW = 0x20, // Day of week compare enable
- ICR1_ALE = 0x40, // Alarm interrupt enable
- ICR1_PFE = 0x80, // Power fail interrupt enable
- ICR1_COMPARE_MASK = 0x3f
+ REG_TEST = 0x1f, // RAM / Test Mode Register
+
+ MSR_INT = 0x01, // Interrupt Status
+ MSR_PF = 0x02, // Power Fail Interrupt
+ MSR_PER = 0x04, // Period Interrupt
+ MSR_AL = 0x08, // Alarm Interrupt
+ MSR_RS = 0x40, // Register Select Bit
+ MSR_RAM_MASK = 0xf0,
+ MSR_INT_MASK = 0x0e,
+ MSR_CLEARABLE_MASK = 0x0c,
+
+ PFR_1MIN = 0x01, // Minutes flag
+ PFR_10S = 0x02, // 10-second flag
+ PFR_1S = 0x04, // Seconds flag
+ PFR_100MS = 0x08, // 100-millisecond flag
+ PFR_10MS = 0x10, // 10-millisecond flag
+ PFR_1MS = 0x20, // Millisecond flag
+ PFR_OSF = 0x40, // Oscillator Failed / Single Supply Bit
+ PFR_TM = 0x80, // Test Mode Enable
+ PFR_READ_CLEAR_MASK = 0x3f,
+
+ TSCR_RAM_MASK = 0x3f,
+ TSCR_NA = 0x40, // N/A
+ TSCR_TS = 0x80, // Time Save Enable
+
+ RTMR_LY0 = 0x01, // Leap Year LSB
+ RTMR_LY1 = 0x02, // Leap Year MSB
+ RTMR_LY = 0x03,
+ RTMR_12H = 0x04, // 12/!24 hour mode
+ RTMR_CSS = 0x08, // Clock Start/!Stop
+ RTMR_IPF = 0x10, // Interrupt PF Operation
+ RTMR_RAM_MASK = 0xe0,
+
+ OMR_RAM_MASK = 0x7f,
+ OMR_MO = 0x80, // MFO Pin as Oscillator
+
+ ICR0_MN = 0x01, // Minutes enable
+ ICR0_TS = 0x02, // 10-second enable
+ ICR0_S = 0x04, // Seconds enable
+ ICR0_HM = 0x08, // 100 millisecond enable
+ ICR0_TM = 0x10, // 10 millisecond enable
+ ICR0_1M = 0x20, // Milliseconds enable
+ ICR0_RAM_MASK = 0xc0,
+
+ ICR1_SC = 0x01, // Second compare enable
+ ICR1_MN = 0x02, // Minute compare enable
+ ICR1_HR = 0x04, // Hour compare enable
+ ICR1_DOM = 0x08, // Day of month compare enable
+ ICR1_MO = 0x10, // Month compare enable
+ ICR1_DOW = 0x20, // Day of week compare enable
+ ICR1_ALE = 0x40, // Alarm interrupt enable
+ ICR1_PFE = 0x80, // Power fail interrupt enable
+ ICR1_COMPARE_MASK = 0x3f
};
uint8_t m_ram[32];
diff --git a/src/devices/machine/t10sbc.cpp b/src/devices/machine/t10sbc.cpp
index e0a08688a91..4b81c5a4a9c 100644
--- a/src/devices/machine/t10sbc.cpp
+++ b/src/devices/machine/t10sbc.cpp
@@ -392,4 +392,4 @@ void t10sbc::ReadCapacity( uint8_t *data )
data[5] = (info->sectorbytes>>16)&0xff;
data[6] = (info->sectorbytes>>8)&0xff;
data[7] = (info->sectorbytes & 0xff);
-} \ No newline at end of file
+}
diff --git a/src/devices/machine/wd33c93.cpp b/src/devices/machine/wd33c93.cpp
index 46426da3bb0..fcbb45957af 100644
--- a/src/devices/machine/wd33c93.cpp
+++ b/src/devices/machine/wd33c93.cpp
@@ -16,15 +16,15 @@
#include "emu.h"
#include "wd33c93.h"
-#define LOG_READS (1 << 0)
-#define LOG_WRITES (1 << 1)
-#define LOG_COMMANDS (1 << 2)
-#define LOG_ERRORS (1 << 3)
-#define LOG_MISC (1 << 4)
-#define LOG_REGS (LOG_READS | LOG_WRITES)
-#define LOG_ALL (LOG_REGS | LOG_COMMANDS | LOG_ERRORS | LOG_MISC)
-
-#define VERBOSE (0)
+#define LOG_READS (1 << 0)
+#define LOG_WRITES (1 << 1)
+#define LOG_COMMANDS (1 << 2)
+#define LOG_ERRORS (1 << 3)
+#define LOG_MISC (1 << 4)
+#define LOG_REGS (LOG_READS | LOG_WRITES)
+#define LOG_ALL (LOG_REGS | LOG_COMMANDS | LOG_ERRORS | LOG_MISC)
+
+#define VERBOSE (0)
#include "logmacro.h"
diff --git a/src/devices/machine/wd33c93.h b/src/devices/machine/wd33c93.h
index 83c1c5a62d9..b4a883afca4 100644
--- a/src/devices/machine/wd33c93.h
+++ b/src/devices/machine/wd33c93.h
@@ -91,18 +91,18 @@ private:
void xferinfo_cmd();
void dispatch_command();
- uint8_t m_sasr;
- uint8_t m_regs[WD_AUXILIARY_STATUS+1];
- uint8_t m_fifo[FIFO_SIZE];
- int m_fifo_pos;
- uint8_t m_temp_input[TEMP_INPUT_LEN];
- int m_temp_input_pos;
- uint8_t m_busphase;
- uint8_t m_identify;
- bool m_read_pending;
- emu_timer *m_cmd_timer;
- emu_timer *m_service_req_timer;
- emu_timer *m_deassert_cip_timer;
+ uint8_t m_sasr;
+ uint8_t m_regs[WD_AUXILIARY_STATUS+1];
+ uint8_t m_fifo[FIFO_SIZE];
+ int m_fifo_pos;
+ uint8_t m_temp_input[TEMP_INPUT_LEN];
+ int m_temp_input_pos;
+ uint8_t m_busphase;
+ uint8_t m_identify;
+ bool m_read_pending;
+ emu_timer *m_cmd_timer;
+ emu_timer *m_service_req_timer;
+ emu_timer *m_deassert_cip_timer;
devcb_write_line m_irq_cb; /* irq callback */
};
diff --git a/src/devices/sound/swp30.cpp b/src/devices/sound/swp30.cpp
index 149d8af27cc..ebae8eb73e8 100644
--- a/src/devices/sound/swp30.cpp
+++ b/src/devices/sound/swp30.cpp
@@ -70,7 +70,7 @@ void f_62fcc(e0, r0, e1, r1l, er5) // 8 (11/12) 1 6 84268
r6, e6 = l925a6[r6].l; // 13d2 5368
} else
r6, e6 = 0, 0;
-
+
}
er0 = *er5.w++;
g214ca4[0x10 + er0].w = e6;
@@ -100,7 +100,7 @@ swp30_device::swp30_device(const machine_config &mconfig, const char *tag, devic
: device_t(mconfig, SWP30, tag, owner, clock),
device_sound_interface(mconfig, *this),
device_rom_interface(mconfig, *this, 25+2, ENDIANNESS_LITTLE, 32)
-{
+{
}
void swp30_device::device_start()
@@ -379,7 +379,7 @@ u16 swp30_device::freq_r(offs_t offset)
void swp30_device::freq_w(offs_t offset, u16 data)
{
u8 chan = offset >> 6;
- // delta is 4*256 per octave, positive means higher freq, e.g 4.10 format.
+ // delta is 4*256 per octave, positive means higher freq, e.g 4.10 format.
s16 v = data & 0x2000 ? data | 0xc000 : data;
if(m_freq[chan] != data)
logerror("snd chan %02x freq %c%c %d.%03x\n", chan, data & 0x8000 ? '#' : '.', data & 0x4000 ? '#' : '.', v / 1024, (v < 0 ? -v : v) & 0x3ff);
@@ -567,9 +567,10 @@ u16 swp30_device::snd_r(offs_t offset)
preg = util::string_format("%03x", (slot-0x21)/2 + 6*chan);
logerror("snd_r [%04x %04x - %-4s] %02x.%02x %04x\n", offset, offset*2, preg, chan, slot, rr[offset]);
}
- if(offset == 0x080f)
+ if(offset == 0x080f) {
return rr[offset] & ~8;
- // return chan == 0x20 && slot == 0xf ? 0 : 0xffff;
+ // return chan == 0x20 && slot == 0xf ? 0 : 0xffff;
+ }
return rr[offset];
}
@@ -655,8 +656,8 @@ void swp30_device::sound_stream_update(sound_stream &stream, stream_sample_t **i
samp = m_sample_log8[read_byte(base_address + spos)];
break;
}
-
- // logerror("sample %02x %06x [%d] %+5d %04x %04x %04x\n", channel, base_address >> 2, m_address[channel] >> 30, spos, samp & 0xffff, m_volume[channel], m_pan[channel]);
+
+ //logerror("sample %02x %06x [%d] %+5d %04x %04x %04x\n", channel, base_address >> 2, m_address[channel] >> 30, spos, samp & 0xffff, m_volume[channel], m_pan[channel]);
// Second, step the sample pos, loop/deactivate as needed
m_sample_pos[channel] += m_sample_increment[m_freq[channel] & 0x3fff];
diff --git a/src/devices/video/catseye.cpp b/src/devices/video/catseye.cpp
index bd3cfa66d93..d94fa1a9420 100644
--- a/src/devices/video/catseye.cpp
+++ b/src/devices/video/catseye.cpp
@@ -205,8 +205,8 @@ void catseye_device::window_move()
return;
LOGMASKED(LOG_WMOVE, "%s%d: %3ux%3u -> %3ux%3u / %3ux%3u planemode %04x wrr %04x, trr %04x m_trrctl %04x acntr %04x\n",
- __func__, idx, m_wmsourcex, m_wmsourcey, m_wmdestx, m_wmdesty, m_wmwidth, m_wmheight, m_planemode[idx],
- m_wrr[idx], m_trr[idx], m_trrctl[idx], m_acntrl);
+ __func__, idx, m_wmsourcex, m_wmsourcey, m_wmdestx, m_wmdesty, m_wmwidth, m_wmheight, m_planemode[idx],
+ m_wrr[idx], m_trr[idx], m_trrctl[idx], m_acntrl);
int line, endline, lineincr;
diff --git a/src/devices/video/imagetek_i4100.cpp b/src/devices/video/imagetek_i4100.cpp
index 1fcf228f01d..fd058e56797 100644
--- a/src/devices/video/imagetek_i4100.cpp
+++ b/src/devices/video/imagetek_i4100.cpp
@@ -1327,4 +1327,4 @@ WRITE_LINE_MEMBER(imagetek_i4100_device::screen_eof)
m_spriteram->copy();
}
-} \ No newline at end of file
+}
diff --git a/src/devices/video/stvvdp1.cpp b/src/devices/video/stvvdp1.cpp
index 013f29454e4..0f8b5093740 100644
--- a/src/devices/video/stvvdp1.cpp
+++ b/src/devices/video/stvvdp1.cpp
@@ -1074,7 +1074,7 @@ void saturn_state::drawpixel_generic(int x, int y, int patterndata, int offsetcn
break;
// TODO: Pro Yakyuu Team mo Tsukurou (during team creation, on PR girl select)
//case 6:
- // break;
+ // break;
case 7: /* Gouraud-shading + half-transparent */
// Lupin the 3rd Pyramid no Kenja enemy shadows
// Death Crimson lives indicators