summaryrefslogtreecommitdiffstatshomepage
path: root/src/mess/machine
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2014-12-31 07:53:27 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2014-12-31 07:53:27 +0100
commite6f78d5ed281850d9e8b391c049b8bf696e140bf (patch)
treec76def6dc672e2b56d3a9b3fb61fec02f0b21f8c /src/mess/machine
parentbfd87ef73a6850f475e2020c2c2935993f932c56 (diff)
Cleanups and version bumpmame0157
Diffstat (limited to 'src/mess/machine')
-rw-r--r--src/mess/machine/gamecom.c2
-rw-r--r--src/mess/machine/ngen_kb.c1
-rw-r--r--src/mess/machine/sms.c6
-rw-r--r--src/mess/machine/victor9k_fdc.c38
-rw-r--r--src/mess/machine/victor9kb.c4
5 files changed, 25 insertions, 26 deletions
diff --git a/src/mess/machine/gamecom.c b/src/mess/machine/gamecom.c
index 0ca4496d6dc..2395f30d318 100644
--- a/src/mess/machine/gamecom.c
+++ b/src/mess/machine/gamecom.c
@@ -500,7 +500,7 @@ WRITE8_MEMBER( gamecom_state::gamecom_handle_dma )
UINT16 dest_addr = m_dma.dest_current & m_dma.dest_mask;
UINT8 dest_adj = (3 - (m_dma.dest_x_current & 3)) << 1;
UINT8 src_adj = (3 - (m_dma.source_x_current & 3)) << 1;
-
+
/* handle DMA for 1 pixel */
// Get new pixel
UINT8 source_pixel = (m_dma.source_bank[src_addr] >> src_adj) & 3;
diff --git a/src/mess/machine/ngen_kb.c b/src/mess/machine/ngen_kb.c
index 498a49dd7fb..8913296100c 100644
--- a/src/mess/machine/ngen_kb.c
+++ b/src/mess/machine/ngen_kb.c
@@ -216,4 +216,3 @@ void ngen_keyboard_device::rcv_complete()
}
const device_type NGEN_KEYBOARD = &device_creator<ngen_keyboard_device>;
-
diff --git a/src/mess/machine/sms.c b/src/mess/machine/sms.c
index 76c2bf0e527..ed3ed5ad016 100644
--- a/src/mess/machine/sms.c
+++ b/src/mess/machine/sms.c
@@ -1299,7 +1299,7 @@ void sms_state::screen_gg_sms_mode_scaling(screen_device &screen, bitmap_rgb32 &
/* Do horizontal scaling */
for (int plot_x = plot_min_x; plot_x <= plot_max_x;)
{
- for (int j = (plot_x - plot_x_group); j <= MIN(1, plot_max_x - plot_x_group); j++)
+ for (int j = (plot_x - plot_x_group); j <= MIN(1, plot_max_x - plot_x_group); j++)
{
if (sms_x + j >= vdp_bitmap.cliprect().min_x && sms_x + j + 1 <= vdp_bitmap.cliprect().max_x)
{
@@ -1366,8 +1366,8 @@ void sms_state::screen_gg_sms_mode_scaling(screen_device &screen, bitmap_rgb32 &
rgb_t c4 = line4[plot_x];
p_bitmap[plot_x] =
rgb_t( ( c1.r() / 6 + c2.r() / 3 + c3.r() / 3 + c4.r() / 6 ),
- ( c1.g() / 6 + c2.g() / 3 + c3.g() / 3 + c4.g() / 6 ),
- ( c1.b() / 6 + c2.b() / 3 + c3.b() / 3 + c4.b() / 6 ) );
+ ( c1.g() / 6 + c2.g() / 3 + c3.g() / 3 + c4.g() / 6 ),
+ ( c1.b() / 6 + c2.b() / 3 + c3.b() / 3 + c4.b() / 6 ) );
}
}
}
diff --git a/src/mess/machine/victor9k_fdc.c b/src/mess/machine/victor9k_fdc.c
index f2c3b2778dc..060d95f80ba 100644
--- a/src/mess/machine/victor9k_fdc.c
+++ b/src/mess/machine/victor9k_fdc.c
@@ -11,20 +11,20 @@
/*
- value error description
+ value error description
- 01 no sync pulse detected
- 02 no header track
- 03 checksum error in header
- 04 not right track
- 05 not right sector
- 06 not a data block
- 07 data checksum error
- 08 sync too long
- 99 not a system disc
+ 01 no sync pulse detected
+ 02 no header track
+ 03 checksum error in header
+ 04 not right track
+ 05 not right sector
+ 06 not a data block
+ 07 data checksum error
+ 08 sync too long
+ 99 not a system disc
- 11 Noise on sync
- FF No sync (bad or unformatted disk)
+ 11 Noise on sync
+ FF No sync (bad or unformatted disk)
*/
@@ -32,9 +32,9 @@
TODO:
- - communication error with SCP after loading boot sector
- - bp ff1a8
- - patch ff1ab=c3
+ - communication error with SCP after loading boot sector
+ - bp ff1a8
+ - patch ff1ab=c3
- single/double sided jumper
- header sync length unknown (6 is too short)
- 8048 spindle speed control
@@ -60,17 +60,17 @@
// this is exactly the same decode/encode as used in the Commodore 4040/8050 series drives
#define GCR_DECODE(_e, _i) \
- ((BIT(_e, 6) << 7) | (BIT(_i, 7) << 6) | (_e & 0x33) | (BIT(_e, 2) << 3) | (_i & 0x04))
+ ((BIT(_e, 6) << 7) | (BIT(_i, 7) << 6) | (_e & 0x33) | (BIT(_e, 2) << 3) | (_i & 0x04))
// E7 E6 I7 E5 E4 E3 E2 I2 E1 E0
#define GCR_ENCODE(_e, _i) \
- ((_e & 0xc0) << 2 | (_i & 0x80) | (_e & 0x3c) << 1 | (_i & 0x04) | (_e & 0x03))
+ ((_e & 0xc0) << 2 | (_i & 0x80) | (_e & 0x3c) << 1 | (_i & 0x04) | (_e & 0x03))
// Tandon TM-100 spindle @ 300RPM, measured TACH 12VAC 256Hz
// TACH = RPM / 60 * SPINDLE RATIO * MOTOR POLES
// 256 = 300 / 60 * 6.4 * 8
-#define SPINDLE_RATIO 6.4
-#define MOTOR_POLES 8
+#define SPINDLE_RATIO 6.4
+#define MOTOR_POLES 8
// TODO wrong values here! motor speed is controlled by an LM2917, with help from the spindle TACH and a DAC0808 whose value is set by the SCP 8048
const int victor_9000_fdc_t::rpm[] = { 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, 254, 255, 257, 259, 260, 262, 264, 266, 267, 269, 271, 273, 275, 276, 278, 280, 282, 284, 286, 288, 290, 291, 293, 295, 297, 299, 301, 303, 305, 307, 309, 311, 313, 315, 318, 320, 322, 324, 326, 328, 330, 333, 335, 337, 339, 342, 344, 346, 348, 351, 353, 355, 358, 360, 362, 365, 367, 370, 372, 375, 377, 380, 382, 385, 387, 390, 392, 395, 398, 400, 403, 406, 408, 411, 414, 416, 419, 422, 425, 428, 430, 433, 436, 439, 442, 445, 448, 451, 454, 457, 460, 463, 466, 469, 472, 475, 478, 482, 485, 488, 491, 494, 498, 501, 504, 508, 511, 514, 518, 521, 525, 528, 532, 535, 539, 542, 546, 550, 553, 557, 561, 564, 568, 572, 576, 579, 583, 587, 591, 595, 599, 603, 607, 611, 615, 619, 623, 627, 631, 636, 640, 644, 648, 653, 657, 661, 666, 670, 674, 679, 683, 688, 693, 697, 702, 706, 711, 716, 721, 725, 730, 735, 740, 745, 750, 755, 760, 765, 770, 775, 780, 785, 790, 796, 801, 806, 812, 817, 822, 828, 833, 839, 844, 850, 856, 861, 867, 873, 878, 884 };
diff --git a/src/mess/machine/victor9kb.c b/src/mess/machine/victor9kb.c
index 2774feffffa..291c62b62cf 100644
--- a/src/mess/machine/victor9kb.c
+++ b/src/mess/machine/victor9kb.c
@@ -347,7 +347,7 @@ Y11 104 103 102 101 100 99 98 97 kN/A k. k00 k0 RGHT LEFT PAUS
#define I8021_TAG "z3"
-#define LOG 0
+#define LOG 0
@@ -433,7 +433,7 @@ INPUT_PORTS_START( victor9k_keyboard )
PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("W") PORT_CODE(KEYCODE_W) PORT_CHAR('w') PORT_CHAR('W') // S36
PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("A") PORT_CODE(KEYCODE_A) PORT_CHAR('a') PORT_CHAR('A') // S56
PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("S") PORT_CODE(KEYCODE_S) PORT_CHAR('s') PORT_CHAR('S') // S57
- PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("UNUSED S75") // unused // S75
+ PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("UNUSED S75") // unused // S75
PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_KEYBOARD ) PORT_NAME("Z") PORT_CODE(KEYCODE_Z) PORT_CHAR('z') PORT_CHAR('Z') // S76
PORT_START("Y2")