|
From: <gp...@us...> - 2025-03-28 18:04:17
|
Revision: 45598
http://sourceforge.net/p/vice-emu/code/45598
Author: gpz
Date: 2025-03-28 18:04:09 +0000 (Fri, 28 Mar 2025)
Log Message:
-----------
third step of 3-way commit in order to rename the via functions, this one renames via3->via1 in code.
Modified Paths:
--------------
trunk/vice/src/vic20/vic20-snapshot.c
trunk/vice/src/vic20/vic20.c
trunk/vice/src/vic20/vic20.h
trunk/vice/src/vic20/vic20datasette.c
trunk/vice/src/vic20/vic20rsuser.c
trunk/vice/src/vic20/vic20via.h
trunk/vice/src/vic20/vic20via2.c
Modified: trunk/vice/src/vic20/vic20-snapshot.c
===================================================================
--- trunk/vice/src/vic20/vic20-snapshot.c 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20-snapshot.c 2025-03-28 18:04:09 UTC (rev 45598)
@@ -79,7 +79,7 @@
if (maincpu_snapshot_write_module(s) < 0
|| vic20_snapshot_write_module(s, save_roms) < 0
|| vic_snapshot_write_module(s) < 0
- || viacore_snapshot_write_module(machine_context.via3, s) < 0
+ || viacore_snapshot_write_module(machine_context.via1, s) < 0
|| viacore_snapshot_write_module(machine_context.via2, s) < 0
|| drive_snapshot_write_module(s, save_disks, save_roms) < 0
|| fsdrive_snapshot_write_module(s) < 0
@@ -129,7 +129,7 @@
if (maincpu_snapshot_read_module(s) < 0
|| vic20_snapshot_read_module(s) < 0
|| vic_snapshot_read_module(s) < 0
- || viacore_snapshot_read_module(machine_context.via3, s) < 0
+ || viacore_snapshot_read_module(machine_context.via1, s) < 0
|| viacore_snapshot_read_module(machine_context.via2, s) < 0
|| drive_snapshot_read_module(s) < 0
|| fsdrive_snapshot_read_module(s) < 0
Modified: trunk/vice/src/vic20/vic20.c
===================================================================
--- trunk/vice/src/vic20/vic20.c 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20.c 2025-03-28 18:04:09 UTC (rev 45598)
@@ -287,9 +287,9 @@
/* ------------------------------------------------------------------------ */
-static int via3_dump(void)
+static int via1_dump(void)
{
- return viacore_dump(machine_context.via3);
+ return viacore_dump(machine_context.via1);
}
static int via2_dump(void)
@@ -300,7 +300,7 @@
static void vic_via1_via2_store(uint16_t addr, uint8_t data)
{
if (addr & 0x10) {
- via3_store(addr, data);
+ via1_store(addr, data);
}
if (addr & 0x20) {
via2_store(addr, data);
@@ -313,7 +313,7 @@
uint8_t retval = vic_read(addr);
if (addr & 0x10) {
- retval &= via3_read(addr);
+ retval &= via1_read(addr);
}
if (addr & 0x20) {
@@ -328,7 +328,7 @@
uint8_t retval = vic_peek(addr);
if (addr & 0x10) {
- retval &= via3_peek(addr);
+ retval &= via1_peek(addr);
}
if (addr & 0x20) {
@@ -341,7 +341,7 @@
static void via1_via2_store(uint16_t addr, uint8_t data)
{
if (addr & 0x10) {
- via3_store(addr, data);
+ via1_store(addr, data);
}
if (addr & 0x20) {
via2_store(addr, data);
@@ -353,7 +353,7 @@
uint8_t retval = 0xff;
if (addr & 0x10) {
- retval &= via3_read(addr);
+ retval &= via1_read(addr);
}
if (addr & 0x20) {
@@ -368,7 +368,7 @@
uint8_t retval = 0xff;
if (addr & 0x10) {
- retval &= via3_peek(addr);
+ retval &= via1_peek(addr);
}
if (addr & 0x20) {
@@ -404,8 +404,8 @@
/* FIXME: the upper 4 bits of the mask are used to indicate the register size if not equal to the mask,
this is done as a temporary HACK to keep mirrors working and still get the correct register size,
this needs to be fixed properly after the 3.6 release */
-static io_source_t via3_device = {
- "VIA3", /* name of the chip */
+static io_source_t via1_device = {
+ "VIA1", /* name of the chip */
IO_DETACH_NEVER, /* chip is never involved in collisions, so no detach */
IO_DETACH_NO_RESOURCE, /* does not use a resource for detach */
#if 0
@@ -417,7 +417,7 @@
NULL, /* NO poke function */
via1_via2_read, /* read function */
via1_via2_peek, /* peek function */
- via3_dump, /* chip state information dump function */
+ via1_dump, /* chip state information dump function */
IO_CART_ID_NONE, /* not a cartridge */
IO_PRIO_HIGH, /* high priority, chip and mirrors never involved in collisions */
0, /* insertion order, gets filled in by the registration function */
@@ -448,13 +448,13 @@
};
static io_source_list_t *vic_list_item = NULL;
-static io_source_list_t *via3_list_item = NULL;
+static io_source_list_t *via1_list_item = NULL;
static io_source_list_t *via2_list_item = NULL;
static void vic20io0_init(void)
{
vic_list_item = io_source_register(&vic_device);
- via3_list_item = io_source_register(&via3_device);
+ via1_list_item = io_source_register(&via1_device);
via2_list_item = io_source_register(&via2_device);
}
@@ -892,7 +892,7 @@
void machine_setup_context(void)
{
- vic20via3_setup_context(&machine_context);
+ vic20via1_setup_context(&machine_context);
vic20via2_setup_context(&machine_context);
vic20ieeevia1_setup_context(&machine_context);
vic20ieeevia2_setup_context(&machine_context);
@@ -960,7 +960,7 @@
return -1;
}
- via3_init(machine_context.via3);
+ via1_init(machine_context.via1);
via2_init(machine_context.via2);
ieeevia1_init(machine_context.ieeevia1);
@@ -1028,7 +1028,7 @@
#endif
/* Register joystick callback (for lightpen triggering via fire button) */
- joystick_register_machine(via3_check_lightpen);
+ joystick_register_machine(via1_check_lightpen);
#ifdef HAVE_MIDI
midi_init();
@@ -1046,7 +1046,7 @@
serial_traps_reset();
- viacore_reset(machine_context.via3);
+ viacore_reset(machine_context.via1);
viacore_reset(machine_context.via2);
vic_reset();
sid_reset();
@@ -1090,7 +1090,7 @@
/* and cartridge */
cartridge_detach_image(-1);
- viacore_shutdown(machine_context.via3);
+ viacore_shutdown(machine_context.via1);
viacore_shutdown(machine_context.via2);
viacore_shutdown(machine_context.ieeevia1);
viacore_shutdown(machine_context.ieeevia2);
@@ -1121,7 +1121,7 @@
void machine_set_restore_key(int v)
{
- viacore_signal(machine_context.via3,
+ viacore_signal(machine_context.via1,
VIA_SIG_CA1, v ? VIA_SIG_FALL : VIA_SIG_RISE);
}
@@ -1285,7 +1285,7 @@
static void vic20_userport_set_flag(uint8_t b)
{
- viacore_signal(machine_context.via3, VIA_SIG_CB1, b ? VIA_SIG_RISE : VIA_SIG_FALL);
+ viacore_signal(machine_context.via1, VIA_SIG_CB1, b ? VIA_SIG_RISE : VIA_SIG_FALL);
}
static userport_port_props_t userport_props = {
Modified: trunk/vice/src/vic20/vic20.h
===================================================================
--- trunk/vice/src/vic20/vic20.h 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20.h 2025-03-28 18:04:09 UTC (rev 45598)
@@ -78,7 +78,7 @@
struct via_context_s;
typedef struct machine_context_s {
- struct via_context_s *via3;
+ struct via_context_s *via1;
struct via_context_s *via2;
struct via_context_s *ieeevia1;
struct via_context_s *ieeevia2;
Modified: trunk/vice/src/vic20/vic20datasette.c
===================================================================
--- trunk/vice/src/vic20/vic20datasette.c 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20datasette.c 2025-03-28 18:04:09 UTC (rev 45598)
@@ -44,7 +44,7 @@
void machine_set_tape_sense(int port, int sense)
{
if (port == TAPEPORT_PORT_1) {
- via3_set_tape_sense(sense);
+ via1_set_tape_sense(sense);
}
}
@@ -51,7 +51,7 @@
void machine_set_tape_write_in(int port, int val)
{
if (port == TAPEPORT_PORT_1) {
- via3_set_tape_write_in(val);
+ via1_set_tape_write_in(val);
}
}
@@ -58,6 +58,6 @@
void machine_set_tape_motor_in(int port, int val)
{
if (port == TAPEPORT_PORT_1) {
- via3_set_tape_motor_in(val);
+ via1_set_tape_motor_in(val);
}
}
Modified: trunk/vice/src/vic20/vic20rsuser.c
===================================================================
--- trunk/vice/src/vic20/vic20rsuser.c 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20rsuser.c 2025-03-28 18:04:09 UTC (rev 45598)
@@ -46,8 +46,8 @@
static void vic20_trigger_start(void)
{
- viacore_signal(machine_context.via3, VIA_SIG_CB1, VIA_SIG_FALL);
- viacore_signal(machine_context.via3, VIA_SIG_CB1, VIA_SIG_RISE);
+ viacore_signal(machine_context.via1, VIA_SIG_CB1, VIA_SIG_FALL);
+ viacore_signal(machine_context.via1, VIA_SIG_CB1, VIA_SIG_RISE);
}
void vic20_rsuser_init(void)
Modified: trunk/vice/src/vic20/vic20via.h
===================================================================
--- trunk/vice/src/vic20/vic20via.h 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20via.h 2025-03-28 18:04:09 UTC (rev 45598)
@@ -33,11 +33,11 @@
struct machine_context_s;
struct via_context_s;
-void vic20via3_setup_context(struct machine_context_s *machine_context);
-void via3_init(struct via_context_s *via_context);
-void via3_store(uint16_t addr, uint8_t byte);
-uint8_t via3_read(uint16_t addr);
-uint8_t via3_peek(uint16_t addr);
+void vic20via1_setup_context(struct machine_context_s *machine_context);
+void via1_init(struct via_context_s *via_context);
+void via1_store(uint16_t addr, uint8_t byte);
+uint8_t via1_read(uint16_t addr);
+uint8_t via1_peek(uint16_t addr);
void vic20via2_setup_context(struct machine_context_s *machine_context);
void via2_init(struct via_context_s *via_context);
@@ -45,10 +45,10 @@
uint8_t via2_read(uint16_t addr);
uint8_t via2_peek(uint16_t addr);
-void via3_set_tape_sense(int v);
-void via3_set_tape_write_in(int v);
-void via3_set_tape_motor_in(int v);
-void via3_check_lightpen(void);
+void via1_set_tape_sense(int v);
+void via1_set_tape_write_in(int v);
+void via1_set_tape_motor_in(int v);
+void via1_check_lightpen(void);
extern int vic20_vflihack_userport;
Modified: trunk/vice/src/vic20/vic20via2.c
===================================================================
--- trunk/vice/src/vic20/vic20via2.c 2025-03-28 17:58:37 UTC (rev 45597)
+++ trunk/vice/src/vic20/vic20via2.c 2025-03-28 18:04:09 UTC (rev 45598)
@@ -59,19 +59,19 @@
store_userport_pbx(userport_pb, userport_pa6 ? USERPORT_NO_PULSE : USERPORT_PULSE);
}
-void via3_store(uint16_t addr, uint8_t data)
+void via1_store(uint16_t addr, uint8_t data)
{
- viacore_store(machine_context.via3, addr, data);
+ viacore_store(machine_context.via1, addr, data);
}
-uint8_t via3_read(uint16_t addr)
+uint8_t via1_read(uint16_t addr)
{
- return viacore_read(machine_context.via3, addr);
+ return viacore_read(machine_context.via1, addr);
}
-uint8_t via3_peek(uint16_t addr)
+uint8_t via1_peek(uint16_t addr)
{
- return viacore_peek(machine_context.via3, addr);
+ return viacore_peek(machine_context.via1, addr);
}
static void set_ca2(via_context_t *via_context, int state)
@@ -100,23 +100,23 @@
static int tape_write_in = 0;
static int tape_motor_in = 0;
-void via3_set_tape_sense(int v)
+void via1_set_tape_sense(int v)
{
tape_sense = v;
}
/* FIXME: find out how to set the write in and motor in lines */
-void via3_set_tape_write_in(int v)
+void via1_set_tape_write_in(int v)
{
tape_write_in = v;
}
-void via3_set_tape_motor_in(int v)
+void via1_set_tape_motor_in(int v)
{
tape_motor_in = v;
}
-static void via3_internal_lightpen_check(uint8_t pa)
+static void via1_internal_lightpen_check(uint8_t pa)
{
uint8_t b = read_joyport_dig(JOYPORT_1);
@@ -125,11 +125,11 @@
vic_set_light_pen(maincpu_clk, !(b & 0x20));
}
-void via3_check_lightpen(void)
+void via1_check_lightpen(void)
{
- uint8_t pa = machine_context.via3->via[VIA_PRA] | ~(machine_context.via3->via[VIA_DDRA]);
+ uint8_t pa = machine_context.via1->via[VIA_PRA] | ~(machine_context.via1->via[VIA_DDRA]);
- via3_internal_lightpen_check(pa);
+ via1_internal_lightpen_check(pa);
}
static void undump_pra(via_context_t *via_context, uint8_t byte)
@@ -142,7 +142,7 @@
{
uint8_t joy_bits = 0;
- via3_internal_lightpen_check(byte);
+ via1_internal_lightpen_check(byte);
iec_pa_write(byte);
joy_bits = ((byte & 0x20) >> 1) | ((byte & 0x1c) >> 2);
@@ -262,18 +262,18 @@
return byte;
}
-void via3_init(via_context_t *via_context)
+void via1_init(via_context_t *via_context)
{
- viacore_init(machine_context.via3, maincpu_alarm_context,
+ viacore_init(machine_context.via1, maincpu_alarm_context,
maincpu_int_status);
}
-void vic20via3_setup_context(machine_context_t *machinecontext)
+void vic20via1_setup_context(machine_context_t *machinecontext)
{
via_context_t *via;
- machinecontext->via3 = lib_malloc(sizeof(via_context_t));
- via = machinecontext->via3;
+ machinecontext->via1 = lib_malloc(sizeof(via_context_t));
+ via = machinecontext->via1;
via->prv = NULL;
via->context = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|