From fad49881ace3908c627e7b6da042c1ba94a8f8bd Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sat, 1 Feb 2020 23:20:14 +1100 Subject: [PATCH] sc3c24xx: debugging leftovers, also logmacro.h uses (1U << 0) for the built-in LOG_GENERAL/LOG, and this file now has enough log categories to need 64-bit masks (nw) --- src/devices/machine/s3c24xx.hxx | 71 +++++++++++++++------------------ 1 file changed, 33 insertions(+), 38 deletions(-) diff --git a/src/devices/machine/s3c24xx.hxx b/src/devices/machine/s3c24xx.hxx index 70500b7d30c..55ab2651d6c 100644 --- a/src/devices/machine/s3c24xx.hxx +++ b/src/devices/machine/s3c24xx.hxx @@ -77,45 +77,45 @@ #endif -#define LOG_RESET (1 << 0) -#define LOG_ADC (1 << 1) -#define LOG_LCD_DMA (1 << 2) -#define LOG_LCD_TIMER (1 << 3) -#define LOG_LCD_REGS (1 << 4) -#define LOG_SPI (1 << 5) -#define LOG_LCD_CFG (1 << 6) -#define LOG_LCD_TFT (1 << 7) -#define LOG_LCD_STN (1 << 8) -#define LOG_CLKPOW (1 << 9) -#define LOG_MMC (1 << 10) -#define LOG_IRQS (1 << 11) -#define LOG_IRQ_REGS (1 << 12) -#define LOG_FLASH (1 << 13) -#define LOG_PWM (1 << 14) -#define LOG_PWM_REGS (1 << 15) -#define LOG_CAM (1 << 16) -#define LOG_DMA (1 << 17) -#define LOG_DMA_REQS (1 << 18) -#define LOG_DMA_REGS (1 << 19) -#define LOG_AC97 (1 << 20) -#define LOG_DMA_TIMERS (1 << 21) -#define LOG_GPIO (1 << 22) -#define LOG_MEMCON (1 << 23) -#define LOG_USBHOST (1 << 24) -#define LOG_UART (1 << 25) -#define LOG_USB (1 << 26) -#define LOG_WDT (1 << 27) -#define LOG_I2C (1 << 28) -#define LOG_I2S (1 << 29) -#define LOG_RTC (1 << 30) -#define LOG_SDI (1 << 31) +#define LOG_RESET (u64(1) << 1) +#define LOG_ADC (u64(1) << 2) +#define LOG_LCD_DMA (u64(1) << 3) +#define LOG_LCD_TIMER (u64(1) << 4) +#define LOG_LCD_REGS (u64(1) << 5) +#define LOG_SPI (u64(1) << 6) +#define LOG_LCD_CFG (u64(1) << 7) +#define LOG_LCD_TFT (u64(1) << 8) +#define LOG_LCD_STN (u64(1) << 9) +#define LOG_CLKPOW (u64(1) << 10) +#define LOG_MMC (u64(1) << 11) +#define LOG_IRQS (u64(1) << 12) +#define LOG_IRQ_REGS (u64(1) << 13) +#define LOG_FLASH (u64(1) << 14) +#define LOG_PWM (u64(1) << 15) +#define LOG_PWM_REGS (u64(1) << 16) +#define LOG_CAM (u64(1) << 17) +#define LOG_DMA (u64(1) << 18) +#define LOG_DMA_REQS (u64(1) << 19) +#define LOG_DMA_REGS (u64(1) << 20) +#define LOG_AC97 (u64(1) << 21) +#define LOG_DMA_TIMERS (u64(1) << 22) +#define LOG_GPIO (u64(1) << 23) +#define LOG_MEMCON (u64(1) << 24) +#define LOG_USBHOST (u64(1) << 25) +#define LOG_UART (u64(1) << 26) +#define LOG_USB (u64(1) << 27) +#define LOG_WDT (u64(1) << 28) +#define LOG_I2C (u64(1) << 29) +#define LOG_I2S (u64(1) << 30) +#define LOG_RTC (u64(1) << 31) +#define LOG_SDI (u64(1) << 32) #define LOG_ALL (LOG_RESET | LOG_ADC | LOG_LCD_DMA | LOG_LCD_TIMER | LOG_LCD_REGS | LOG_SPI | LOG_LCD_CFG | LOG_LCD_TFT | LOG_LCD_STN \ | LOG_CLKPOW | LOG_MMC | LOG_IRQS | LOG_IRQ_REGS | LOG_FLASH | LOG_PWM | LOG_PWM_REGS | LOG_CAM | LOG_DMA | LOG_DMA_REQS \ | LOG_DMA_REGS | LOG_AC97 | LOG_DMA_TIMERS | LOG_GPIO | LOG_MEMCON | LOG_USBHOST | LOG_UART | LOG_USB \ | LOG_WDT | LOG_I2C | LOG_I2S | LOG_RTC | LOG_SDI) -#define VERBOSE (LOG_ALL & ~(LOG_FLASH | LOG_UART)) +//#define VERBOSE (LOG_ALL & ~(LOG_FLASH | LOG_UART)) #include "logmacro.h" /*************************************************************************** @@ -272,11 +272,6 @@ void S3C24_CLASS_NAME::s3c24xx_lcd_dma_reload() LOGMASKED(LOG_LCD_DMA, "LCD - vramaddr %08X %08X offsize %08X pagewidth %08X\n", m_lcd.vramaddr_cur, m_lcd.vramaddr_max, m_lcd.offsize, m_lcd.pagewidth_max); m_lcd.dma_data = 0; m_lcd.dma_bits = 0; - - if (machine().input().code_pressed_once(KEYCODE_K)) - { - s3c24xx_uart_fifo_w(0, 0x55); - } } void S3C24_CLASS_NAME::s3c24xx_lcd_dma_init()