summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/apple2gs.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/apple2gs.cpp')
-rw-r--r--src/mame/machine/apple2gs.cpp98
1 files changed, 49 insertions, 49 deletions
diff --git a/src/mame/machine/apple2gs.cpp b/src/mame/machine/apple2gs.cpp
index 91430cdce15..37cee8f58e5 100644
--- a/src/mame/machine/apple2gs.cpp
+++ b/src/mame/machine/apple2gs.cpp
@@ -139,7 +139,7 @@
void apple2gs_state::process_clock()
{
- UINT8 operation;
+ uint8_t operation;
seconds_t current_interval;
/* update clock_curtime */
@@ -233,7 +233,7 @@ void apple2gs_state::process_clock()
* Interrupts
* ----------------------------------------------------------------------- */
-const char *apple2gs_state::apple2gs_irq_name(UINT16 irq_mask)
+const char *apple2gs_state::apple2gs_irq_name(uint16_t irq_mask)
{
switch(irq_mask)
{
@@ -250,7 +250,7 @@ const char *apple2gs_state::apple2gs_irq_name(UINT16 irq_mask)
return nullptr;
}
-void apple2gs_state::apple2gs_add_irq(UINT16 irq_mask)
+void apple2gs_state::apple2gs_add_irq(uint16_t irq_mask)
{
if ((m_pending_irqs & irq_mask) == 0x00)
{
@@ -264,7 +264,7 @@ void apple2gs_state::apple2gs_add_irq(UINT16 irq_mask)
-void apple2gs_state::apple2gs_remove_irq(UINT16 irq_mask)
+void apple2gs_state::apple2gs_remove_irq(uint16_t irq_mask)
{
if (m_pending_irqs & irq_mask)
{
@@ -317,7 +317,7 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_qsecond_tick)
#if !RUN_ADB_MICRO
-UINT8 apple2gs_state::adb_read_memory(UINT32 address)
+uint8_t apple2gs_state::adb_read_memory(uint32_t address)
{
if (address < ARRAY_LENGTH(m_adb_memory))
return m_adb_memory[address];
@@ -327,7 +327,7 @@ UINT8 apple2gs_state::adb_read_memory(UINT32 address)
-void apple2gs_state::adb_write_memory(UINT32 address, UINT8 data)
+void apple2gs_state::adb_write_memory(uint32_t address, uint8_t data)
{
if (address < ARRAY_LENGTH(m_adb_memory))
m_adb_memory[address] = data;
@@ -335,21 +335,21 @@ void apple2gs_state::adb_write_memory(UINT32 address, UINT8 data)
-void apple2gs_state::adb_set_mode(UINT8 mode)
+void apple2gs_state::adb_set_mode(uint8_t mode)
{
m_adb_mode = mode;
}
-void apple2gs_state::adb_set_config(UINT8 b1, UINT8 b2, UINT8 b3)
+void apple2gs_state::adb_set_config(uint8_t b1, uint8_t b2, uint8_t b3)
{
/* ignore for now */
}
-void apple2gs_state::adb_post_response(const UINT8 *bytes, size_t length)
+void apple2gs_state::adb_post_response(const uint8_t *bytes, size_t length)
{
assert(length < ARRAY_LENGTH(m_adb_response_bytes));
memcpy(m_adb_response_bytes, bytes, length);
@@ -361,16 +361,16 @@ void apple2gs_state::adb_post_response(const UINT8 *bytes, size_t length)
-void apple2gs_state::adb_post_response_1(UINT8 b)
+void apple2gs_state::adb_post_response_1(uint8_t b)
{
adb_post_response(&b, 1);
}
-void apple2gs_state::adb_post_response_2(UINT8 b1, UINT8 b2)
+void apple2gs_state::adb_post_response_2(uint8_t b1, uint8_t b2)
{
- UINT8 b[2];
+ uint8_t b[2];
b[0] = b1;
b[1] = b2;
adb_post_response(b, 2);
@@ -380,8 +380,8 @@ void apple2gs_state::adb_post_response_2(UINT8 b1, UINT8 b2)
void apple2gs_state::adb_do_command()
{
int device;
- UINT32 address;
- UINT8 val;
+ uint32_t address;
+ uint8_t val;
m_adb_state = ADBSTATE_IDLE;
if (LOG_ADB)
@@ -467,9 +467,9 @@ void apple2gs_state::adb_do_command()
}
-UINT8 apple2gs_state::adb_read_datareg()
+uint8_t apple2gs_state::adb_read_datareg()
{
- UINT8 result;
+ uint8_t result;
switch(m_adb_state)
{
@@ -495,7 +495,7 @@ UINT8 apple2gs_state::adb_read_datareg()
}
-void apple2gs_state::adb_write_datareg(UINT8 data)
+void apple2gs_state::adb_write_datareg(uint8_t data)
{
if (LOG_ADB)
logerror("adb_write_datareg(): data=0x%02x\n", data);
@@ -612,13 +612,13 @@ void apple2gs_state::adb_write_datareg(UINT8 data)
// real rom 3 h/w reads 0x90 when idle, 0x98 when key pressed
// current MESS reads back 0xb0 when idle
-UINT8 apple2gs_state::adb_read_kmstatus()
+uint8_t apple2gs_state::adb_read_kmstatus()
{
return m_adb_kmstatus;
}
-void apple2gs_state::adb_write_kmstatus(UINT8 data)
+void apple2gs_state::adb_write_kmstatus(uint8_t data)
{
m_adb_kmstatus &= ~0x54;
m_adb_kmstatus |= data & 0x54;
@@ -626,11 +626,11 @@ void apple2gs_state::adb_write_kmstatus(UINT8 data)
-UINT8 apple2gs_state::adb_read_mousedata()
+uint8_t apple2gs_state::adb_read_mousedata()
{
- UINT8 result = 0x00;
- UINT8 absolute;
- INT8 delta;
+ uint8_t result = 0x00;
+ uint8_t absolute;
+ int8_t delta;
if (m_adb_kmstatus & 0x80) // mouse register full
{
@@ -659,7 +659,7 @@ UINT8 apple2gs_state::adb_read_mousedata()
}
-INT8 apple2gs_state::seven_bit_diff(UINT8 v1, UINT8 v2)
+int8_t apple2gs_state::seven_bit_diff(uint8_t v1, uint8_t v2)
{
v1 -= v2;
if (v1 & 0x40)
@@ -673,7 +673,7 @@ INT8 apple2gs_state::seven_bit_diff(UINT8 v1, UINT8 v2)
void apple2gs_state::adb_check_mouse()
{
- UINT8 new_mouse_x, new_mouse_y;
+ uint8_t new_mouse_x, new_mouse_y;
/* read mouse values */
if ((m_adb_kmstatus & 0x80) == 0x00)
@@ -698,7 +698,7 @@ void apple2gs_state::adb_check_mouse()
#endif
-void apple2gs_state::apple2gs_set_scanint(UINT8 data)
+void apple2gs_state::apple2gs_set_scanint(uint8_t data)
{
/* second interrupt */
if ((m_vgcint & 0x40) && !(data & 0x40))
@@ -729,7 +729,7 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick)
/* check scanline interrupt bits if we're in super hi-res and the current scanline is within the active display area */
if ((m_newvideo & 0x80) && (scanline >= (BORDER_TOP-1)) && (scanline < (200+BORDER_TOP-1)))
{
- UINT8 scb;
+ uint8_t scb;
scb = m_slowmem[0x19D00 + scanline - BORDER_TOP + 1];
@@ -785,7 +785,7 @@ TIMER_CALLBACK_MEMBER(apple2gs_state::apple2gs_scanline_tick)
READ8_MEMBER( apple2gs_state::gssnd_r )
{
- UINT8 ret = 0;
+ uint8_t ret = 0;
switch (offset)
{
@@ -797,7 +797,7 @@ READ8_MEMBER( apple2gs_state::gssnd_r )
if (m_sndglu_ctrl & 0x40) // docram access
{
- UINT8 *docram = memregion("es5503")->base();
+ uint8_t *docram = memregion("es5503")->base();
m_sndglu_dummy_read = docram[m_sndglu_addr];
}
else
@@ -837,7 +837,7 @@ WRITE8_MEMBER( apple2gs_state::gssnd_w )
case 1: // data write
if (m_sndglu_ctrl & 0x40) // docram access
{
- UINT8 *docram = memregion("es5503")->base();
+ uint8_t *docram = memregion("es5503")->base();
docram[m_sndglu_addr] = data;
}
else
@@ -871,7 +871,7 @@ WRITE8_MEMBER( apple2gs_state::gssnd_w )
int apple2gs_state::apple2gs_get_vpos()
{
int result, scan;
- static const UINT8 top_border_vert[BORDER_TOP] =
+ static const uint8_t top_border_vert[BORDER_TOP] =
{
0xfa, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfb, 0xfb,
0xfc, 0xfc, 0xfc, 0xfd, 0xfd, 0xfe, 0xfe, 0xff,
@@ -894,7 +894,7 @@ int apple2gs_state::apple2gs_get_vpos()
READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
{
- UINT8 result;
+ uint8_t result;
scc8530_t *scc;
if(space.debugger_access())
@@ -943,7 +943,7 @@ READ8_MEMBER( apple2gs_state::apple2gs_c0xx_r )
result = 0;
{
- UINT8 temp = m_kbspecial->read();
+ uint8_t temp = m_kbspecial->read();
if (temp & 1) // capslock
{
result |= 4;
@@ -1447,7 +1447,7 @@ static void apple2gs_mem_004000(running_machine &machine,offs_t begin, offs_t en
meminfo->write_handler = (state->m_flags & VAR_RAMWRT) ? &state->write_delegates_2gs4000[0] : &state->write_delegates_2gs4000[1];
}
-static void apple2gs_mem_xxD000(running_machine &machine,apple2_meminfo *meminfo, UINT32 lcmem)
+static void apple2gs_mem_xxD000(running_machine &machine,apple2_meminfo *meminfo, uint32_t lcmem)
{
apple2gs_state *state = machine.driver_data<apple2gs_state>();
if (state->m_flags & VAR_LCRAM)
@@ -1475,7 +1475,7 @@ static void apple2gs_mem_xxD000(running_machine &machine,apple2_meminfo *meminfo
}
}
-static void apple2gs_mem_xxE000(running_machine &machine,apple2_meminfo *meminfo, UINT32 lcmem)
+static void apple2gs_mem_xxE000(running_machine &machine,apple2_meminfo *meminfo, uint32_t lcmem)
{
apple2gs_state *state = machine.driver_data<apple2gs_state>();
if (state->m_flags & VAR_LCRAM)
@@ -1590,9 +1590,9 @@ static const apple2_memmap_entry apple2gs_memmap_entries[] =
-UINT8 *apple2gs_state::apple2gs_getslotmem(offs_t address)
+uint8_t *apple2gs_state::apple2gs_getslotmem(offs_t address)
{
- UINT8 *rom;
+ uint8_t *rom;
address %= 0x00FFFF;
assert(address >= 0xC000);
@@ -1605,9 +1605,9 @@ UINT8 *apple2gs_state::apple2gs_getslotmem(offs_t address)
-UINT8 apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address)
+uint8_t apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address)
{
- UINT8 result;
+ uint8_t result;
int slot;
if ((m_shadow & 0x40) && ((address & 0xF00000) == 0x000000)) // shadow all banks and C0xx?
@@ -1687,7 +1687,7 @@ UINT8 apple2gs_state::apple2gs_xxCxxx_r(address_space &space, offs_t address)
-void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, UINT8 data)
+void apple2gs_state::apple2gs_xxCxxx_w(address_space &space, offs_t address, uint8_t data)
{
int slot;
@@ -1821,7 +1821,7 @@ void apple2gs_state::apple2gs_setup_memory()
apple2_memmap_config cfg;
/* allocate memory for E00000-E1FFFF */
- m_slowmem = make_unique_clear<UINT8[]>(128*1024);
+ m_slowmem = make_unique_clear<uint8_t[]>(128*1024);
save_pointer(m_slowmem.get(), "APPLE2GS_SLOWMEM", 128*1024);
// install expanded memory
@@ -1972,7 +1972,7 @@ MACHINE_START_MEMBER(apple2gs_state,apple2gscommon)
machine().device<nvram_device>("nvram")->set_base(m_clock_bram, sizeof(m_clock_bram));
/* save state stuff. note that the driver takes care of docram. */
- UINT8* ram = m_ram->pointer();
+ uint8_t* ram = m_ram->pointer();
save_pointer(ram, "APPLE2GS_RAM", m_ram->size());
save_item(m_newvideo, "NEWVIDEO");
@@ -2061,9 +2061,9 @@ void apple2gs_state::apple2gs_refresh_delegates()
* Keym_glu / low-level ADB emulation
* ----------------------------------------------------------------------- */
#if RUN_ADB_MICRO
-UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset)
+uint8_t apple2gs_state::keyglu_mcu_read(uint8_t offset)
{
- UINT8 rv = m_glu_regs[offset];
+ uint8_t rv = m_glu_regs[offset];
// printf("MCU reads reg %x\n", offset);
@@ -2085,7 +2085,7 @@ UINT8 apple2gs_state::keyglu_mcu_read(UINT8 offset)
return rv;
}
-void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data)
+void apple2gs_state::keyglu_mcu_write(uint8_t offset, uint8_t data)
{
m_glu_regs[offset] = data;
@@ -2127,13 +2127,13 @@ void apple2gs_state::keyglu_mcu_write(UINT8 offset, UINT8 data)
C027 KMSTATUS = GLU system status register
*/
-UINT8 apple2gs_state::keyglu_816_read(UINT8 offset)
+uint8_t apple2gs_state::keyglu_816_read(uint8_t offset)
{
switch (offset)
{
case GLU_C000:
{
- UINT8 rv;
+ uint8_t rv;
rv = m_glu_regs[GLU_KEY_DATA] & 0x7f;
if (m_glu_regs[GLU_KG_STATUS] & KGS_KEYSTROBE)
{
@@ -2145,7 +2145,7 @@ UINT8 apple2gs_state::keyglu_816_read(UINT8 offset)
case GLU_C010:
{
- UINT8 rv;
+ uint8_t rv;
rv = m_glu_regs[GLU_KEY_DATA] & 0x7f;
if (m_glu_regs[GLU_KG_STATUS] & KGS_KEYSTROBE)
{
@@ -2209,7 +2209,7 @@ UINT8 apple2gs_state::keyglu_816_read(UINT8 offset)
return 0xff;
}
-void apple2gs_state::keyglu_816_write(UINT8 offset, UINT8 data)
+void apple2gs_state::keyglu_816_write(uint8_t offset, uint8_t data)
{
if (offset < GLU_C000)
{