summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/drivers/next.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/drivers/next.cpp')
-rw-r--r--src/mame/drivers/next.cpp52
1 files changed, 26 insertions, 26 deletions
diff --git a/src/mame/drivers/next.cpp b/src/mame/drivers/next.cpp
index 96bc17eca26..7fff206f5c8 100644
--- a/src/mame/drivers/next.cpp
+++ b/src/mame/drivers/next.cpp
@@ -32,7 +32,7 @@
#include "machine/nscsi_hd.h"
#include "softlist.h"
-UINT32 next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
+uint32_t next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
{
// We don't handle partial updates, but we don't generate them either :-)
if(cliprect.min_x || cliprect.min_y || cliprect.max_x+1 != screen_sx || cliprect.max_y+1 != screen_sy)
@@ -43,29 +43,29 @@ UINT32 next_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, co
// 1120x832 (8)
// 832x624 (5c,9c)
if(screen_color) {
- const UINT32 *vr = vram;
+ const uint32_t *vr = vram;
for(int y=0; y<screen_sy; y++) {
- UINT32 *pix = reinterpret_cast<UINT32 *>(bitmap.raw_pixptr(y));
+ uint32_t *pix = reinterpret_cast<uint32_t *>(bitmap.raw_pixptr(y));
for(int x=0; x<screen_sx; x+=2) {
- UINT32 v = *vr++;
+ uint32_t v = *vr++;
for(int xi=0; xi<2; xi++) {
- UINT16 pen = (v >> (16-(xi*16))) & 0xffff;
- UINT32 r = (pen & 0xf000) >> 12;
- UINT32 g = (pen & 0x0f00) >> 8;
- UINT32 b = (pen & 0x00f0) >> 4;
- UINT32 col = (r << 20) | (r << 16) | (g << 12) | (g << 8) | (b << 4) | b;
+ uint16_t pen = (v >> (16-(xi*16))) & 0xffff;
+ uint32_t r = (pen & 0xf000) >> 12;
+ uint32_t g = (pen & 0x0f00) >> 8;
+ uint32_t b = (pen & 0x00f0) >> 4;
+ uint32_t col = (r << 20) | (r << 16) | (g << 12) | (g << 8) | (b << 4) | b;
*pix++ = col;
}
}
vr += screen_skip;
}
} else {
- static UINT32 colors[4] = { 0xffffff, 0xaaaaaa, 0x555555, 0x000000 };
- const UINT32 *vr = vram;
+ static uint32_t colors[4] = { 0xffffff, 0xaaaaaa, 0x555555, 0x000000 };
+ const uint32_t *vr = vram;
for(int y=0; y<screen_sy; y++) {
- UINT32 *pix = reinterpret_cast<UINT32 *>(bitmap.raw_pixptr(y));
+ uint32_t *pix = reinterpret_cast<uint32_t *>(bitmap.raw_pixptr(y));
for(int x=0; x<screen_sx; x+=16) {
- UINT32 v = *vr++;
+ uint32_t v = *vr++;
for(int xi=0; xi<16; xi++)
*pix++ = colors[(v >> (30-(xi*2))) & 0x3];
}
@@ -132,7 +132,7 @@ READ32_MEMBER( next_state::scr2_r )
*/
- UINT32 data = scr2 & 0xfffffbff;
+ uint32_t data = scr2 & 0xfffffbff;
data |= rtc->sdo_r() << 10;
@@ -219,8 +219,8 @@ READ32_MEMBER( next_state::scr1_r )
void next_state::irq_set(int id, bool raise)
{
- UINT32 mask = 1U << id;
- UINT32 old_status = irq_status;
+ uint32_t mask = 1U << id;
+ uint32_t old_status = irq_status;
if(raise)
irq_status |= mask;
else
@@ -248,7 +248,7 @@ WRITE32_MEMBER( next_state::irq_mask_w )
void next_state::irq_check()
{
- UINT32 act = irq_status & (irq_mask | 0x80000000);
+ uint32_t act = irq_status & (irq_mask | 0x80000000);
int bit;
for(bit=31; bit >= 0 && !(act & (1U << bit)); bit--);
@@ -309,7 +309,7 @@ void next_state::dma_drq_w(int slot, bool state)
if(ds.state & DMA_READ) {
while(ds.drq) {
dma_check_update(slot);
- UINT8 val;
+ uint8_t val;
bool eof;
bool err;
dma_read(slot, val, eof, err);
@@ -326,7 +326,7 @@ void next_state::dma_drq_w(int slot, bool state)
} else {
while(ds.drq) {
dma_check_update(slot);
- UINT8 val = space.read_byte(ds.current++);
+ uint8_t val = space.read_byte(ds.current++);
bool eof = ds.current == (ds.limit & 0x7fffffff) && (ds.limit & 0x80000000);
bool err;
dma_write(slot, val, eof, err);
@@ -343,7 +343,7 @@ void next_state::dma_drq_w(int slot, bool state)
}
}
-void next_state::dma_read(int slot, UINT8 &val, bool &eof, bool &err)
+void next_state::dma_read(int slot, uint8_t &val, bool &eof, bool &err)
{
err = false;
eof = false;
@@ -375,7 +375,7 @@ void next_state::dma_read(int slot, UINT8 &val, bool &eof, bool &err)
}
}
-void next_state::dma_write(int slot, UINT8 data, bool eof, bool &err)
+void next_state::dma_write(int slot, uint8_t data, bool eof, bool &err)
{
err = false;
switch(slot) {
@@ -452,7 +452,7 @@ READ32_MEMBER( next_state::dma_regs_r)
int slot = offset >> 2;
int reg = offset & 3;
- UINT32 res;
+ uint32_t res;
switch(reg) {
case 0:
@@ -527,7 +527,7 @@ WRITE32_MEMBER( next_state::dma_ctrl_w)
}
}
-void next_state::dma_do_ctrl_w(int slot, UINT8 data)
+void next_state::dma_do_ctrl_w(int slot, uint8_t data)
{
const char *name = dma_name(slot);
#if 0
@@ -574,7 +574,7 @@ const int next_state::scsi_clocks[4] = { 10000000, 12000000, 20000000, 16000000
READ32_MEMBER( next_state::scsictrl_r )
{
- UINT32 res = (scsictrl << 24) | (scsistat << 16);
+ uint32_t res = (scsictrl << 24) | (scsistat << 16);
logerror("scsictrl_read %08x @ %08x (%08x)\n", res, mem_mask, space.device().safe_pc());
return res;
}
@@ -640,7 +640,7 @@ READ32_MEMBER( next_state::fdc_control_r )
if(fdc) {
floppy_image_device *fdev = machine().device<floppy_connector>(":fdc:0")->get_device();
if(fdev->exists()) {
- UINT32 variant = fdev->get_variant();
+ uint32_t variant = fdev->get_variant();
switch(variant) {
case floppy_image::SSSD:
case floppy_image::SSDD:
@@ -835,7 +835,7 @@ WRITE8_MEMBER(next_state::ramdac_w)
}
}
-void next_state::setup(UINT32 _scr1, int size_x, int size_y, int skip, bool color)
+void next_state::setup(uint32_t _scr1, int size_x, int size_y, int skip, bool color)
{
scr1 = _scr1;
screen_sx = size_x;