diff --git a/hash/c128_flop.xml b/hash/c128_flop.xml
index 6cb7ab8e9c7..2217fab2653 100644
--- a/hash/c128_flop.xml
+++ b/hash/c128_flop.xml
@@ -374,6 +374,80 @@
+
+ Paperback Writer 128
+ 1985
+ Digital Solutions
+
+
+
+
+
+
+
+
+
+
+
+ Paperback Writer 128 (Alt)
+ 1985
+ Digital Solutions
+
+
+
+
+
+
+
+
+
+
+
+ Term Paper Writer
+ 1986
+ Activision
+
+
+
+
+
+
+
+
+
+
+
+ The Great War
+ 1987
+ Free Spirit Software
+
+
+
+
+
+
+
+
+
+
+ Sylvia Porter's Personal Finance Series - Your Personal Financial Planner 128
+ 1984
+ Timeworks
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Commodore 1570/1571 Test Demo
198?
diff --git a/src/emu/machine/64h156.c b/src/emu/machine/64h156.c
index e0d509cb8c0..508034169dd 100644
--- a/src/emu/machine/64h156.c
+++ b/src/emu/machine/64h156.c
@@ -336,7 +336,7 @@ void c64h156_device::live_run(const attotime &limit)
// update signals
if (byte != cur_live.byte) {
if (!byte || !cur_live.accl) {
- if (LOG) logerror("%s BYTE %u\n", cur_live.tm.as_string(),byte);
+ if (LOG) logerror("%s BYTE %02x\n", cur_live.tm.as_string(), cur_live.shift_reg & 0xff);
cur_live.byte = byte;
syncpoint = true;
}
diff --git a/src/lib/formats/g64_dsk.c b/src/lib/formats/g64_dsk.c
index fa721f22fd0..6cbb345adc8 100644
--- a/src/lib/formats/g64_dsk.c
+++ b/src/lib/formats/g64_dsk.c
@@ -53,12 +53,10 @@ bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
for (int track = 0; track < track_count; track++)
{
- int cylinder = track;
+ int cylinder = track % TRACK_COUNT;
- if (track >= TRACK_COUNT) {
- cylinder -= TRACK_COUNT;
+ if (track == TRACK_COUNT)
head = 1;
- }
UINT32 tpos = POS_TRACK_OFFSET + (track * 4);
UINT32 spos = tpos + (track_count * 4);
@@ -78,7 +76,7 @@ bool g64_format::load(io_generic *io, UINT32 form_factor, floppy_image *image)
UINT16 track_bytes = pick_integer_le(&img[0], dpos, 2);
int track_size = track_bytes * 8;
- LOG_FORMATS("head %u track %u size %u cell %ld\n", head, cylinder, track_size, 200000000L/track_size);
+ LOG_FORMATS("head %u track %u offs %u size %u cell %ld\n", head, cylinder, dpos, track_bytes, 200000000L/track_size);
generate_track_from_bitstream(cylinder, head, &img[dpos+2], track_size, image);
}
@@ -170,12 +168,12 @@ const char *g64_format::name() const
const char *g64_format::description() const
{
- return "Commodore 1541 GCR disk image";
+ return "Commodore 1541/1571 GCR disk image";
}
const char *g64_format::extensions() const
{
- return "g64,g41";
+ return "g64,g41,g71";
}
const floppy_format_type FLOPPY_G64_FORMAT = &floppy_image_format_creator;