From dc7983902ecad3ee90b9bc25d0415cbfc726e3f3 Mon Sep 17 00:00:00 2001 From: OBattler Date: Sat, 13 Jun 2020 10:44:18 +0200 Subject: [PATCH] Fixed some wrong letter casing in cdrom/cdrom_image_backend.c and updated Makefile.local. --- src/Makefile.local | 49 ++++++++++++++++++++++----------- src/cdrom/cdrom_image_backend.c | 8 +++--- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/src/Makefile.local b/src/Makefile.local index 9774208a7..5e2e1dafe 100644 --- a/src/Makefile.local +++ b/src/Makefile.local @@ -10,8 +10,6 @@ # settings, so we can avoid changing the main one for all of # our local setups. # -# Version: @(#)Makefile.local 1.0.22 2019/10/20 -# # Author: Fred N. van Kempen, # @@ -35,15 +33,21 @@ STUFF := # -DENABLE_VRAM_DUMP enables Video Ram dumping. # -DENABLE_LOG_BREAKPOINT enables extra logging. # Root logging: +# -DENABLE_ACPI_LOG=N sets logging level at N. # -DENABLE_APM_LOG=N sets logging level at N. # -DENABLE_BUGGER_LOG=N sets logging level at N. # -DENABLE_CONFIG_LOG=N sets logging level at N. +# -DENABLE_DDMA_LOG=N sets logging level at N. # -DENABLE_DEVICE_LOG=N sets logging level at N. +# -DENABLE_DMA_LOG=N sets logging level at N. # -DENABLE_IO_LOG=N sets logging level at N. -# -DENABLE_PIIX_LOG=N sets logging level at N. +# -DENABLE_IOAPIC_LOG=N sets logging level at N. # -DENABLE_ISAMEM_LOG=N sets logging level at N. # -DENABLE_ISARTC_LOG=N sets logging level at N. # -DENABLE_KEYBOARD_AT_LOG=N sets logging level at N. +# -DENABLE_KEYBOARD_XT_LOG=N sets logging level at N. +# -DENABLE_LM75_LOG=N sets logging level at N. +# -DENABLE_LM78_LOG=N sets logging level at N. # -DENABLE_MEM_LOG=N sets logging level at N. # -DENABLE_MOUSE_LOG=N sets logging level at N. # -DENABLE_MOUSE_BUS_LOG=N sets logging level at N. @@ -53,30 +57,41 @@ STUFF := # -DENABLE_PC_LOG=N sets logging level at N. # -DENABLE_PCI_LOG=N sets logging level at N. # -DENABLE_PIC_LOG=N sets logging level at N. +# -DENABLE_PIT_LOG=N sets logging level at N. +# -DENABLE_POSTCARD_LOG=N sets logging level at N. # -DENABLE_ROM_LOG=N sets logging level at N. # -DENABLE_SERIAL_LOG=N sets logging level at N. +# -DENABLE_SMBUS_LOG=N sets logging level at N. +# -DENABLE_SMBUS_PIIX4_LOG=N sets logging level at N. +# -DENABLE_SPD_LOG=N sets logging level at N. +# -DENABLE_USB_LOG=N sets logging level at N. # -DENABLE_VNC_LOG=N sets logging level at N. # -DENABLE_VNC_KEYMAP_LOG=N sets logging level at N. # cdrom/ logging: # -DENABLE_CDROM_LOG=N sets logging level at N. -# -DENABLE_CDROM_DOSBOX_LOG=N sets logging level at N. # -DENABLE_CDROM_IMAGE_LOG=N sets logging level at N. -# cpu/ logging: +# -DENABLE_CDROM_IMAGE_BACKEND_LOG=N sets logging level at N. +# chipset/ logging: +# -DENABLE_I420EX_LOG=N sets logging level at N. +# -DENABLE_NEAT_LOG=N sets logging level at N. +# -DENABLE_PIIX_LOG=N sets logging level at N. +# -DENABLE_SIO_LOG=N sets logging level at N. +# cpu/, cpu_common/, cpu_new/ logging: +# -DENABLE_X86SEG_LOG=N sets logging level at N. +# cpu_common/ logging: # -DENABLE_386_LOG=N sets logging level at N. +# -DENABLE_386_COMMON_LOG=N sets logging level at N. # -DENABLE_386_DYNAREC_LOG=N sets logging level at N. # -DENABLE_808X_LOG=N sets logging level at N. +# -DENABLE_CPU_LOG=N sets logging level at N. # -DENABLE_FPU_LOG=N sets logging level at N. -# -DENABLE_X86SEG_LOG=N sets logging level at N. -# cpu_new/ logging: -# -DENABLE_386_COMMON_LOG=N sets logging level at N. -# chipset/ logging: -# -DENABLE_NEAT_LOG=N sets logging level at N. # disk/ logging: # -DENABLE_ESDI_AT_LOG=N sets logging level at N. # -DENABLE_ESDI_MCA_LOG=N sets logging level at N. # -DENABLE_HDC_LOG=N sets logging level at N. # -DENABLE_HDD_IMAGE_LOG=N sets logging level at N. # -DENABLE_IDE_LOG=N sets logging level at N. +# -DENABLE_MO_LOG=N sets logging level at N. # -DENABLE_SFF_LOG=N sets logging level at N. # -DENABLE_ST506_AT_LOG=N sets logging level at N. # -DENABLE_ST506_XT_LOG=N sets logging level at N. @@ -109,15 +124,19 @@ STUFF := # -DENABLE_NETWORK_LOG=N sets logging level at N. # -DENABLE_NIC_LOG=N sets logging level at N. # -DENABLE_PCAP_LOG=N sets logging level at N. +# -DENABLE_PCNET_LOG=N sets logging level at N. # -DENABLE_SLIRP_LOG=N sets logging level at N. # -DENABLE_WD_LOG=N sets logging level at N. +# printer/ logging: +# -DENABLE_ESCP_LOG=N sets logging level at N. # scsi/ logging: # -DENABLE_AHA154X_LOG=N sets logging level at N. # -DENABLE_BUSLOGIC_LOG=N sets logging level at N. -# -DENABLE_SCSI_CDROM_LOG=N sets logging level at N. -# -DENABLE_SCSI_DISK_LOG=N sets logging level at N. # -DENABLE_NCR5380_LOG=N sets logging level at N. # -DENABLE_NCR53C8XX_LOG=N sets logging level at N. +# -DENABLE_SCSI_CDROM_LOG=N sets logging level at N. +# -DENABLE_SCSI_DISK_LOG=N sets logging level at N. +# -DENABLE_SPOCK_LOG=N sets logging level at N. # -DENABLE_X54X_LOG=N sets logging level at N. # sound/ logging: # -DENABLE_ADLIB_LOG=N sets logging level at N. @@ -139,15 +158,13 @@ STUFF := # -DENABLE_PGC_LOG=N sets logging level at N. # -DENABLE_S3_VIRGE_LOG=N sets logging level at N. # -DENABLE_VID_TABLE_LOG=N sets logging level at N. +# -DENABLE_VIDEO_LOG=N sets logging level at N. # -DENABLE_VOODOO_LOG=N sets logging level at N. -# -DENABLE_VRAM_DUMP=N sets logging level at N. # win/ logging: # -DENABLE_WIN_LOG=N sets logging level at N. -# -DENABLE_D2D_LOG=N sets logging level at N. -# -DENABLE_DDRAW_LOG=N sets logging level at N. +# -DENABLE_DISCORD_LOG=N sets logging level at N. # -DENABLE_DYNLD_LOG=N sets logging level at N. # -DENABLE_JOYSTICK_LOG=N sets logging level at N. -# -DENABLE_LOG_BREAKPOINT=N sets logging level at N. # -DENABLE_LOG_TOGGLES=N sets logging level at N. # -DENABLE_SDL_LOG=N sets logging level at N. # -DENABLE_SETTINGS_LOG=N sets logging level at N. diff --git a/src/cdrom/cdrom_image_backend.c b/src/cdrom/cdrom_image_backend.c index d939762d7..802069978 100644 --- a/src/cdrom/cdrom_image_backend.c +++ b/src/cdrom/cdrom_image_backend.c @@ -83,14 +83,14 @@ bin_read(void *p, uint8_t *buffer, uint64_t seek, size_t count) return 0; if (fseeko64(tf->file, seek, SEEK_SET) == -1) { -#ifdef ENABLE_cdrom_image_backend_log +#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG cdrom_image_backend_log("CDROM: binary_read failed during seek!\n"); #endif return 0; } if (fread(buffer, count, 1, tf->file) != 1) { -#ifdef ENABLE_cdrom_image_backend_log +#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG cdrom_image_backend_log("CDROM: binary_read failed during read!\n"); #endif return 0; @@ -953,7 +953,7 @@ cdi_load_cue(cd_img_t *cdi, const wchar_t *cuefile) trk.file = track_file_init(filename, &error); } if (error) { -#ifdef ENABLE_cdrom_image_backend_log +#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG cdrom_image_backend_log("CUE: cannot open fille '%ls' in cue sheet!\n", filename); #endif @@ -971,7 +971,7 @@ cdi_load_cue(cd_img_t *cdi, const wchar_t *cuefile) /* Ignored commands. */ success = 1; } else { -#ifdef ENABLE_cdrom_image_backend_log +#ifdef ENABLE_CDROM_IMAGE_BACKEND_LOG cdrom_image_backend_log("CUE: unsupported command '%s' in cue sheet!\n", command.c_str()); #endif