claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The Pravetz keyboard and video are now properly implemented.

Browse Source
This commit is contained in:
OBattler
2022-10-20 00:33:30 +02:00
parent e4a320fb0b
commit d963bf4237
7 changed files with 129 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/device/keyboard_xt.c
View File

@@ -65,6 +65,7 @@
#define KBD_TYPE_VTECH 7 #define KBD_TYPE_VTECH 7
#define KBD_TYPE_OLIVETTI 8 #define KBD_TYPE_OLIVETTI 8
#define KBD_TYPE_ZENITH 9 #define KBD_TYPE_ZENITH 9
#define KBD_TYPE_PRAVETZ 10
typedef struct { typedef struct {
int want_irq; int want_irq;
@@ -73,7 +74,7 @@ typedef struct {
uint8_t pa, pb, pd; uint8_t pa, pb, pd;
uint8_t key_waiting; uint8_t key_waiting;
uint8_t type; uint8_t type, pravetz_flags;
pc_timer_t send_delay_timer; pc_timer_t send_delay_timer;
} xtkbd_t; } xtkbd_t;
@@ -513,6 +514,7 @@ static void
kbd_write(uint16_t port, uint8_t val, void *priv) kbd_write(uint16_t port, uint8_t val, void *priv)
{ {
xtkbd_t *kbd = (xtkbd_t *) priv; xtkbd_t *kbd = (xtkbd_t *) priv;
uint8_t bit, set;
switch (port) { switch (port) {
case 0x61: /* Keyboard Control Register (aka Port B) */ case 0x61: /* Keyboard Control Register (aka Port B) */
@@ -527,7 +529,8 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
timer_process(); timer_process();
if (((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) && (cassette != NULL)) if (((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ)) &&
(cassette != NULL))
pc_cas_set_motor(cassette, (kbd->pb & 0x08) == 0); pc_cas_set_motor(cassette, (kbd->pb & 0x08) == 0);
speaker_update(); speaker_update();
@@ -546,16 +549,25 @@ kbd_write(uint16_t port, uint8_t val, void *priv)
} }
#ifdef ENABLE_KEYBOARD_XT_LOG #ifdef ENABLE_KEYBOARD_XT_LOG
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
kbd_log("Cassette motor is %s\n", !(val & 0x08) ? "ON" : "OFF"); kbd_log("Cassette motor is %s\n", !(val & 0x08) ? "ON" : "OFF");
#endif #endif
break; break;
#ifdef ENABLE_KEYBOARD_XT_LOG #ifdef ENABLE_KEYBOARD_XT_LOG
case 0x62: /* Switch Register (aka Port C) */ case 0x62: /* Switch Register (aka Port C) */
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
kbd_log("Cassette IN is %i\n", !!(val & 0x10)); kbd_log("Cassette IN is %i\n", !!(val & 0x10));
break; break;
#endif #endif
case 0xc0 ... 0xcf: /* Pravetz Flags */
kbd_log("Port %02X out: %02X\n", port, val);
if (kbd->type == KBD_TYPE_PRAVETZ) {
bit = (port >> 1) & 0x07;
set = (port & 0x01) << bit;
kbd->pravetz_flags = (kbd->pravetz_flags & ~(1 << bit)) | set;
}
break;
} }
} }
@@ -567,8 +579,8 @@ kbd_read(uint16_t port, void *priv)
switch (port) { switch (port) {
case 0x60: /* Keyboard Data Register (aka Port A) */ case 0x60: /* Keyboard Data Register (aka Port A) */
if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_ZENITH))) { if ((kbd->pb & 0x80) && ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_ZENITH))) {
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ))
ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00); ret = (kbd->pd & ~0x02) | (hasfpu ? 0x02 : 0x00);
else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86)) else if ((kbd->type == KBD_TYPE_XT82) || (kbd->type == KBD_TYPE_XT86))
ret = 0xff; /* According to Ruud on the PCem forum, this is supposed to return 0xFF on the XT. */ ret = 0xff; /* According to Ruud on the PCem forum, this is supposed to return 0xFF on the XT. */
@@ -600,7 +612,7 @@ kbd_read(uint16_t port, void *priv)
break; break;
case 0x62: /* Switch Register (aka Port C) */ case 0x62: /* Switch Register (aka Port C) */
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) { if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ)) {
if (kbd->pb & 0x04) /* PB2 */ if (kbd->pb & 0x04) /* PB2 */
switch (mem_size + isa_mem_size) { switch (mem_size + isa_mem_size) {
case 64: case 64:
@@ -640,7 +652,7 @@ kbd_read(uint16_t port, void *priv)
/* This is needed to avoid error 131 (cassette error). /* This is needed to avoid error 131 (cassette error).
This is serial read: bit 5 = clock, bit 4 = data, cassette header is 256 x 0xff. */ This is serial read: bit 5 = clock, bit 4 = data, cassette header is 256 x 0xff. */
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82)) { if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) || (kbd->type == KBD_TYPE_PRAVETZ)) {
if (cassette == NULL) if (cassette == NULL)
ret |= (ppispeakon ? 0x10 : 0); ret |= (ppispeakon ? 0x10 : 0);
else else
@@ -657,6 +669,12 @@ kbd_read(uint16_t port, void *priv)
|| (kbd->type == KBD_TYPE_TOSHIBA)) || (kbd->type == KBD_TYPE_TOSHIBA))
ret = kbd->pd; ret = kbd->pd;
break; break;
case 0xc0: /* Pravetz Flags */
if (kbd->type == KBD_TYPE_PRAVETZ)
ret = kbd->pravetz_flags;
kbd_log("Port %02X in : %02X\n", port, ret);
break;
} }
return (ret); return (ret);
@@ -671,6 +689,7 @@ kbd_reset(void *priv)
kbd->blocked = 0; kbd->blocked = 0;
kbd->pa = 0x00; kbd->pa = 0x00;
kbd->pb = 0x00; kbd->pb = 0x00;
kbd->pravetz_flags = 0x00;
keyboard_scan = 1; keyboard_scan = 1;
@@ -697,16 +716,20 @@ kbd_init(const device_t *info)
keyboard_send = kbd_adddata_ex; keyboard_send = kbd_adddata_ex;
kbd_reset(kbd); kbd_reset(kbd);
kbd->type = info->local; kbd->type = info->local;
if (kbd->type == KBD_TYPE_PRAVETZ) {
pclog("Pravetz keyboard!\n");
io_sethandler(0x00c0, 16,
kbd_read, NULL, NULL, kbd_write, NULL, NULL, kbd);
}
key_queue_start = key_queue_end = 0; key_queue_start = key_queue_end = 0;
video_reset(gfxcard); video_reset(gfxcard);
if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) if ((kbd->type == KBD_TYPE_PC81) || (kbd->type == KBD_TYPE_PC82) ||
|| (kbd->type == KBD_TYPE_XT82) || (kbd->type <= KBD_TYPE_XT86) (kbd->type == KBD_TYPE_PRAVETZ) || (kbd->type == KBD_TYPE_XT82) ||
|| (kbd->type == KBD_TYPE_COMPAQ) (kbd->type <= KBD_TYPE_XT86) || (kbd->type == KBD_TYPE_COMPAQ) ||
|| (kbd->type == KBD_TYPE_TOSHIBA) (kbd->type == KBD_TYPE_TOSHIBA) || (kbd->type == KBD_TYPE_OLIVETTI)) {
|| (kbd->type == KBD_TYPE_OLIVETTI)) {
/* DIP switch readout: bit set = OFF, clear = ON. */ /* DIP switch readout: bit set = OFF, clear = ON. */
if (kbd->type == KBD_TYPE_OLIVETTI) if (kbd->type == KBD_TYPE_OLIVETTI)
@@ -894,6 +917,20 @@ const device_t keyboard_pc82_device = {
.config = NULL .config = NULL
}; };
const device_t keyboard_pravetz_device = {
.name = "Pravetz Keyboard",
.internal_name = "keyboard_pravetz",
.flags = 0,
.local = KBD_TYPE_PRAVETZ,
.init = kbd_init,
.close = kbd_close,
.reset = kbd_reset,
{ .available = NULL },
.speed_changed = NULL,
.force_redraw = NULL,
.config = NULL
};
const device_t keyboard_xt_device = { const device_t keyboard_xt_device = {
.name = "XT (1982) Keyboard", .name = "XT (1982) Keyboard",
.internal_name = "keyboard_xt", .internal_name = "keyboard_xt",

1
src/include/86box/keyboard.h
View File

@@ -146,6 +146,7 @@ extern int mouse_scan;
#ifdef EMU_DEVICE_H #ifdef EMU_DEVICE_H
extern const device_t keyboard_pc_device; extern const device_t keyboard_pc_device;
extern const device_t keyboard_pc82_device; extern const device_t keyboard_pc82_device;
extern const device_t keyboard_pravetz_device;
extern const device_t keyboard_xt_device; extern const device_t keyboard_xt_device;
extern const device_t keyboard_xt86_device; extern const device_t keyboard_xt86_device;
extern const device_t keyboard_xt_compaq_device; extern const device_t keyboard_xt_compaq_device;

2
src/include/86box/vid_cga.h
View File

@@ -67,7 +67,9 @@ void cga_poll(void *p);
#ifdef EMU_DEVICE_H #ifdef EMU_DEVICE_H
extern const device_config_t cga_config[]; extern const device_config_t cga_config[];
extern const device_t cga_device; extern const device_t cga_device;
extern const device_t cga_pravetz_device;
#endif #endif
#endif /*VIDEO_CGA_H*/ #endif /*VIDEO_CGA_H*/

27
src/machine/m_xt.c
View File

@@ -18,6 +18,7 @@
#include <86box/rom.h> #include <86box/rom.h>
#include <86box/machine.h> #include <86box/machine.h>
#include <86box/chipset.h> #include <86box/chipset.h>
#include <86box/port_6x.h>
static void static void
machine_xt_common_init(const machine_t *model) machine_xt_common_init(const machine_t *model)
@@ -331,15 +332,33 @@ machine_xt_iskra3104_init(const machine_t *model)
int int
machine_xt_pravetz16_imko4_init(const machine_t *model) machine_xt_pravetz16_imko4_init(const machine_t *model)
{ {
int ret; int ret;
ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.bin", ret = bios_load_linear("roms/machines/pravetz16/BIOS_IMKO4_FE00.bin",
0x000fe000, 8192, 0); 0x000fe000, 65536, 0);
if (ret) {
ret = bios_load_aux_linear("roms/machines/pravetz16/IMKO4-D34_SGS-M2764ADIP28.BIN",
0x000f4000, 8192, 0);
if (ret) {
bios_load_aux_linear("roms/machines/pravetz16/1.bin",
0x000f6000, 8192, 0);
bios_load_aux_linear("roms/machines/pravetz16/2.bin",
0x000fa000, 8192, 0);
bios_load_aux_linear("roms/machines/pravetz16/5.bin",
0x000f8000, 8192, 0);
bios_load_aux_linear("roms/machines/pravetz16/6.bin",
0x000fc000, 8192, 0);
}
}
if (bios_only || !ret) if (bios_only || !ret)
return ret; return ret;
device_add(&keyboard_at_device); device_add(&keyboard_pravetz_device);
machine_xt_common_init(model); machine_xt_common_init(model);

45
src/video/vid_cga.c
View File

@@ -117,6 +117,22 @@ cga_in(uint16_t addr, void *p)
return ret; return ret;
} }
void
cga_pravetz_out(uint16_t addr, uint8_t val, void *p)
{
cga_t *cga = (cga_t *) p;
cga->fontbase = (((unsigned int) val) << 8);
}
uint8_t
cga_pravetz_in(uint16_t addr, void *p)
{
cga_t *cga = (cga_t *) p;
return (cga->fontbase >> 8);
}
void void
cga_waitstates(void *p) cga_waitstates(void *p)
{ {
@@ -524,6 +540,21 @@ cga_standalone_init(const device_t *info)
return cga; return cga;
} }
void *
cga_pravetz_init(const device_t *info)
{
cga_t *cga = cga_standalone_init(info);
loadfont("roms/video/cga/CGA - PRAVETZ.BIN", 10);
io_removehandler(0x03dd, 0x0001, cga_in, NULL, NULL, cga_out, NULL, NULL, cga);
io_sethandler(0x03dd, 0x0001, cga_pravetz_in, NULL, NULL, cga_pravetz_out, NULL, NULL, cga);
cga->fontbase = 0x0300;
return cga;
}
void void
cga_close(void *p) cga_close(void *p)
{ {
@@ -637,3 +668,17 @@ const device_t cga_device = {
.force_redraw = NULL, .force_redraw = NULL,
.config = cga_config .config = cga_config
}; };
const device_t cga_pravetz_device = {
.name = "Pravetz VDC-2",
.internal_name = "cga_pravetz",
.flags = DEVICE_ISA,
.local = 0,
.init = cga_pravetz_init,
.close = cga_close,
.reset = NULL,
{ .available = NULL },
.speed_changed = cga_speed_changed,
.force_redraw = NULL,
.config = cga_config
};

1
src/video/vid_table.c
View File

@@ -127,6 +127,7 @@ video_cards[] = {
{ &paradise_wd90c30_device }, { &paradise_wd90c30_device },
{ &colorplus_device }, { &colorplus_device },
{ &pgc_device }, { &pgc_device },
{ &cga_pravetz_device },
{ &radius_svga_multiview_isa_device }, { &radius_svga_multiview_isa_device },
{ &realtek_rtg3106_device }, { &realtek_rtg3106_device },
{ &s3_diamond_stealth_vram_isa_device }, { &s3_diamond_stealth_vram_isa_device },

7
src/video/video.c
View File

@@ -1083,6 +1083,13 @@ loadfont_common(FILE *f, int format)
for (c = 0; c < 256; c++) for (c = 0; c < 256; c++)
(void) !fread(&fontdat12x18[c][0], 1, 36, f); (void) !fread(&fontdat12x18[c][0], 1, 36, f);
break; break;
case 10: /* Pravetz */
for (c = 0; c < 1024; c++) /* Allow up to 1024 chars */
for (d = 0; d < 8; d++)
fontdat[c][d] = fgetc(f) & 0xff;
break;
} }
(void) fclose(f); (void) fclose(f);