From 9b5f030af7a1600f8242a6334aec669351649f13 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 15 Aug 2016 23:40:02 +0200 Subject: [PATCH] Fixed some compile-breaking errors. --- src/intel_flash.c | 4 ++ src/nvr.c | 100 +++++++++++++++++++++++++--------------------- 2 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/intel_flash.c b/src/intel_flash.c index 2b5c50151..3321652f5 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -184,9 +184,11 @@ void *intel_flash_init(uint8_t type) case ROM_MB500N: strcpy(flash_path, "roms/mb500n/"); break; +#if 0 case ROM_P54TP4XE: strcpy(flash_path, "roms/p54tp4xe/"); break; +#endif case ROM_ACERM3A: strcpy(flash_path, "roms/acerm3a/"); break; @@ -196,9 +198,11 @@ void *intel_flash_init(uint8_t type) case ROM_P55TVP4: strcpy(flash_path, "roms/p55tvp4/"); break; +#if 0 case ROM_P55T2P4: strcpy(flash_path, "roms/p55t2p4/"); break; +#endif case ROM_430VX: strcpy(flash_path, "roms/430vx/"); break; diff --git a/src/nvr.c b/src/nvr.c index a8206cfc8..196cb01f4 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -1,6 +1,3 @@ -/* Copyright holders: Mahod, Tenshi - see COPYING for more details -*/ #include #include "ibm.h" #include "io.h" @@ -16,19 +13,18 @@ int nvraddr; int nvr_dosave = 0; -static int64_t nvr_onesec_time = 0; -static int nvr_onesec_cnt = 0; +static int nvr_onesec_time = 0, nvr_onesec_cnt = 0; void getnvrtime() { - time_get(nvrram); + time_get(nvrram); } void nvr_recalc() { int c; int newrtctime; - c=1<<((nvrram[RTCREGA]&(RTCRS0|RTCRS1|RTCRS2|RTCRS3))-1); + c = 1 << ((nvrram[RTC_REGA] & RTC_RS) - 1); newrtctime=(int)(RTCCONST * c * (1 << TIMER_SHIFT)); if (rtctime>newrtctime) rtctime=newrtctime; } @@ -36,18 +32,18 @@ void nvr_recalc() void nvr_rtc(void *p) { int c; - if (!(nvrram[RTCREGA]&(RTCRS0|RTCRS1|RTCRS2|RTCRS3))) + if (!(nvrram[RTC_REGA] & RTC_RS)) { rtctime=0x7fffffff; return; } - c=1<<((nvrram[RTCREGA]&(RTCRS0|RTCRS1|RTCRS2|RTCRS3))-1); + c = 1 << ((nvrram[RTC_REGA] & RTC_RS) - 1); rtctime += (int)(RTCCONST * c * (1 << TIMER_SHIFT)); // pclog("RTCtime now %f\n",rtctime); - nvrram[RTCREGC] |= RTCPF; - if (nvrram[RTCREGB]&RTCPIE) + nvrram[RTC_REGC] |= RTC_PF; + if (nvrram[RTC_REGB] & RTC_PIE) { - nvrram[RTCREGC]|=RTCIRQF; + nvrram[RTC_REGC] |= RTC_IRQF; if (AMSTRAD) picint(2); else picint(0x100); // pclog("RTC int\n"); @@ -63,32 +59,32 @@ int nvr_check_alarm(int nvraddr) return (nvrram[nvraddr + 1] == nvrram[nvraddr] || (nvrram[nvraddr + 1] & ALARM_DONTCARE) == ALARM_DONTCARE); } -int64_t nvr_update_end_count = 0; +int nvr_update_end_count = 0; void nvr_update_end(void *p) { - if (!(nvrram[RTCREGB] & RTCSET)) + if (!(nvrram[RTC_REGB] & RTC_SET)) { getnvrtime(); /* Clear update status. */ nvr_update_status = 0; - if (nvr_check_alarm(RTCSECONDS) && nvr_check_alarm(RTCMINUTES) && nvr_check_alarm(RTCHOURS)) + if (nvr_check_alarm(RTC_SECONDS) && nvr_check_alarm(RTC_MINUTES) && nvr_check_alarm(RTC_HOURS)) { - nvrram[RTCREGC] |= RTCAF; - if (nvrram[RTCREGB] & RTCAIE) + nvrram[RTC_REGC] |= RTC_AF; + if (nvrram[RTC_REGB] & RTC_AIE) { - nvrram[RTCREGC] |= RTCIRQF; + nvrram[RTC_REGC] |= RTC_IRQF; if (AMSTRAD) picint(2); else picint(0x100); } } /* The flag and interrupt should be issued on update ended, not started. */ - nvrram[RTCREGC] |= RTCUF; - if (nvrram[RTCREGB] & RTCUIE) + nvrram[RTC_REGC] |= RTC_UF; + if (nvrram[RTC_REGB] & RTC_UIE) { - nvrram[RTCREGC] |= RTCIRQF; + nvrram[RTC_REGC] |= RTC_IRQF; if (AMSTRAD) picint(2); else picint(0x100); } @@ -104,9 +100,9 @@ void nvr_onesec(void *p) nvr_onesec_cnt++; if (nvr_onesec_cnt >= 100) { - if (!(nvrram[RTCREGB] & RTCSET)) + if (!(nvrram[RTC_REGB] & RTC_SET)) { - nvr_update_status = RTCUIP; + nvr_update_status = RTC_UIP; rtc_tick(); nvr_update_end_count = (int)((244.0 + 1984.0) * TIMER_USEC); @@ -122,20 +118,21 @@ void writenvr(uint16_t addr, uint8_t val, void *priv) // printf("Write NVR %03X %02X %02X %04X:%04X %i\n",addr,nvraddr,val,cs>>4,pc,ins); if (addr&1) { - if (nvraddr==RTCREGC || nvraddr==RTCREGD) return; /* Registers C and D are read-only. There's no reason to continue. */ + if (nvraddr==RTC_REGC || nvraddr==RTC_REGD) + return; /* Registers C and D are read-only. There's no reason to continue. */ // if (nvraddr == 0x33) pclog("NVRWRITE33 %02X %04X:%04X %i\n",val,CS,pc,ins); - if (nvraddr > RTCREGD && nvrram[nvraddr] != val) + if (nvraddr > RTC_REGD && nvrram[nvraddr] != val) nvr_dosave = 1; old = nvrram[nvraddr]; nvrram[nvraddr]=val; - if (nvraddr==RTCREGA) + if (nvraddr == RTC_REGA) { // pclog("NVR rate %i\n",val&0xF); - if (val&(RTCRS0|RTCRS1|RTCRS2|RTCRS3)) + if (val & RTC_RS) { - c=1<<((val&(RTCRS0|RTCRS1|RTCRS2|RTCRS3))-1); + c = 1 << ((val & RTC_RS) - 1); rtctime += (int)(RTCCONST * c * (1 << TIMER_SHIFT)); } else @@ -143,16 +140,16 @@ void writenvr(uint16_t addr, uint8_t val, void *priv) } else { - if (nvraddr==RTCREGB) + if (nvraddr == RTC_REGB) { - if (((old ^ val) & RTCSET) && (val & RTCSET)) + if (((old ^ val) & RTC_SET) && (val & RTC_SET)) { - nvrram[RTCREGA] &= ~RTCUIP; /* This has to be done according to the datasheet. */ - nvrram[RTCREGB] &= ~RTCUIE; /* This also has to happen per the specification. */ + nvrram[RTC_REGA] &= ~RTC_UIP; /* This has to be done according to the datasheet. */ + nvrram[RTC_REGB] &= ~RTC_UIE; /* This also has to happen per the specification. */ } } - if ((nvraddr < RTCREGA) || (nvraddr == RTCCENTURY)) + if ((nvraddr < RTC_REGA) || (nvraddr == RTC_CENTURY)) { if ((nvraddr != 1) && (nvraddr != 3) && (nvraddr != 5)) { @@ -174,14 +171,16 @@ uint8_t readnvr(uint16_t addr, void *priv) // printf("Read NVR %03X %02X %02X %04X:%04X\n",addr,nvraddr,nvrram[nvraddr],cs>>4,pc); if (addr&1) { - if (nvraddr==RTCREGA) return ((nvrram[RTCREGA] & 0x7F) | nvr_update_status); - if (nvraddr==RTCREGD) nvrram[RTCREGD]|=RTCVRT; - if (nvraddr==RTCREGC) + if (nvraddr == RTC_REGA) + return ((nvrram[RTC_REGA] & 0x7F) | nvr_update_status); + if (nvraddr == RTC_REGD) + nvrram[RTC_REGD] |= RTC_VRT; + if (nvraddr == RTC_REGC) { if (AMSTRAD) picintc(2); else picintc(0x100); - temp=nvrram[RTCREGC]; - nvrram[RTCREGC]=0; /* All flags in register C are unused (always 0) or cleared on read */ + temp = nvrram[RTC_REGC]; + nvrram[RTC_REGC] = 0; return temp; } // if (AMIBIOS && nvraddr==0x36) return 0; @@ -230,10 +229,14 @@ void loadnvr() case ROM_586MC1: f = romfopen("nvr/586mc1.nvr", "rb"); nvrmask = 127; break; case ROM_PLATO: f = romfopen("nvr/plato.nvr", "rb"); nvrmask = 127; break; case ROM_MB500N: f = romfopen("nvr/mb500n.nvr", "rb"); nvrmask = 127; break; +#if 0 case ROM_P54TP4XE: f = romfopen("nvr/p54tp4xe.nvr", "rb"); nvrmask = 127; break; +#endif case ROM_ACERM3A: f = romfopen("nvr/acerm3a.nvr", "rb"); nvrmask = 127; break; case ROM_ACERV35N: f = romfopen("nvr/acerv35n.nvr", "rb"); nvrmask = 127; break; +#if 0 case ROM_P55T2P4: f = romfopen("nvr/p55t2p4.nvr", "rb"); nvrmask = 127; break; +#endif case ROM_P55TVP4: f = romfopen("nvr/p55tvp4.nvr", "rb"); nvrmask = 127; break; case ROM_P55VA: f = romfopen("nvr/p55va.nvr", "rb"); nvrmask = 127; break; case ROM_440FX: f = romfopen("nvr/440fx.nvr", "rb"); nvrmask = 127; break; @@ -245,11 +248,11 @@ void loadnvr() memset(nvrram,0xFF,128); if (!enable_sync) { - nvrram[RTCSECONDS] = nvrram[RTCMINUTES] = nvrram[RTCHOURS] = 0; - nvrram[RTCDOM] = nvrram[RTCMONTH] = 1; - nvrram[RTCYEAR] = BCD(80); - nvrram[RTCCENTURY] = BCD(19); - nvrram[RTCREGB]=RTC2412; + nvrram[RTC_SECONDS] = nvrram[RTC_MINUTES] = nvrram[RTC_HOURS] = 0; + nvrram[RTC_DOM] = nvrram[RTC_MONTH] = 1; + nvrram[RTC_YEAR] = BCD(80); + nvrram[RTC_CENTURY] = BCD(19); + nvrram[RTC_REGB] = RTC_2412; } return; } @@ -259,9 +262,9 @@ void loadnvr() else time_internal_set_nvrram(nvrram); /* Update the internal clock state based on the NVR registers. */ fclose(f); - nvrram[RTCREGA]=(RTCRS1|RTCRS2); - nvrram[RTCREGB]=RTC2412; - c=1<<((nvrram[RTCREGA]&(RTCRS0|RTCRS1|RTCRS2|RTCRS3))-1); + nvrram[RTC_REGA] = 6; + nvrram[RTC_REGB] = RTC_2412; + c = 1 << ((nvrram[RTC_REGA] & RTC_RS) - 1); rtctime += (int)(RTCCONST * c * (1 << TIMER_SHIFT)); } void savenvr() @@ -300,10 +303,14 @@ void savenvr() case ROM_586MC1: f = romfopen("nvr/586mc1.nvr", "wb"); break; case ROM_PLATO: f = romfopen("nvr/plato.nvr", "wb"); break; case ROM_MB500N: f = romfopen("nvr/mb500n.nvr", "wb"); break; +#if 0 case ROM_P54TP4XE: f = romfopen("nvr/p54tp4xe.nvr", "wb"); break; +#endif case ROM_ACERM3A: f = romfopen("nvr/acerm3a.nvr", "wb"); break; case ROM_ACERV35N: f = romfopen("nvr/acerv35n.nvr", "wb"); break; +#if 0 case ROM_P55T2P4: f = romfopen("nvr/p55t2p4.nvr", "wb"); break; +#endif case ROM_P55TVP4: f = romfopen("nvr/p55tvp4.nvr", "wb"); break; case ROM_P55VA: f = romfopen("nvr/p55va.nvr", "wb"); break; case ROM_440FX: f = romfopen("nvr/440fx.nvr", "wb"); break; @@ -320,4 +327,5 @@ void nvr_init() timer_add(nvr_rtc, &rtctime, TIMER_ALWAYS_ENABLED, NULL); timer_add(nvr_onesec, &nvr_onesec_time, TIMER_ALWAYS_ENABLED, NULL); timer_add(nvr_update_end, &nvr_update_end_count, &nvr_update_end_count, NULL); + }