/*
* (C) Copyright 2014 Leo C. <erbl259-lmu@yahoo.de>
*
- * SPDX-License-Identifier: GPL-2.0+
+ * SPDX-License-Identifier: GPL-2.0
*/
#include "common.h"
debug_cond(DEBUG_CPM_SDIO, fmt, ##args)
-
-/*--------------------------------------------------------------------------*/
-
-
-uint8_t z80_get_byte(uint32_t adr)
-{
- uint8_t data;
-
- z80_bus_cmd(Request);
- data = z80_read(adr);
- z80_bus_cmd(Release);
-
- return data;
-}
-
-
/*--------------------------------------------------------------------------*/
struct msg_item {
stamp = days * ONE_DAY;
stamp += bcd2bin(msg[0]);
stamp += bcd2bin(msg[1]) * 60 ;
- stamp += bcd2bin(msg[2]) * 3600;
+ stamp += bcd2bin(msg[2]) * 3600L;
gmtime_r(&stamp, tmp);
return 0;
}
cpm_time[2] = bin2bcd(tmp->tm_hour);
cpm_time[3] = days;
cpm_time[4] = days >> 8;
-
- debug("## mk_cpmtime: tm_year: %d, tm_yday: %d, days: %d\n",
- tmp->tm_year, tmp->tm_yday, days);
}
/* get/set cp/m time */
/* initialize t with current time */
rc = rtc_get (&t);
- if (rc == 0) {
+ if (rc >= 0) {
/* insert new date & time */
if (mk_date_time (len, msg, &t) != 0) {
my_puts_P(PSTR("## set_time: Bad date format\n"));
/* FALL TROUGH */
case 2: /* get date & time */
rc = rtc_get (&t);
+ if (rc >= 0) {
+ time_t time;
+ time = mk_gmtime(&t);
+ //mktime(&t);
+ gmtime_r(&time, &t);
- if (rc) {
+ mk_cpm_time(&t, cpm_time);
+ } else {
my_puts_P(PSTR("## get_time: Get date failed\n"));
- break;
}
-
- time_t time;
- time = mk_gmtime(&t);
- //mktime(&t);
- gmtime_r(&time, &t);
-
-
- mk_cpm_time(&t, cpm_time);
break;
}
/* ---------------------------------------------------------------------------*/
-#define MAX_DRIVE 4
+#define MAX_DRIVE 8
#define BLOCK_SIZE 512
-#define TPA_BASE 0x10000
-#define COMMON_BASE 0xC000
+//#define TPA_BASE 0x10000
+//#define COMMON_BASE 0xC000
struct cpm_drive_s {
uint8_t drv;
strcpy_P((char *)disk_buffer, PSTR("dsk0"));
disk_buffer[3] = msg[0] + '0';
- if (((np = getenv((char*)disk_buffer)) == NULL) ||
+ if (((np = getenv_char((char*)disk_buffer)) == NULL) ||
((drv_table[drv].img_name = strdup(np)) == NULL)) {
return msg_cpm_result(subf, 0x03, res);
}
res = f_lseek(&drv_table[drv].fd, pos);
while (!res && secs--) {
- unsigned int cnt, br;
-
- /* check bank boundary crossing */
- cnt = 0;
- if (addr < (TPA_BASE + COMMON_BASE) &&
- (addr + BLOCK_SIZE) > (TPA_BASE + COMMON_BASE)) {
- cnt = (TPA_BASE + COMMON_BASE) - addr;
- }
-
- if (cnt) {
- debug_cpmsd("## %67c addr: %.5lx, cnt: %3d\n", ' ', addr, cnt);
- debug_cpmsd("## %67c addr: %.5lx, cnt: %3d\n", ' ', addr+cnt-TPA_BASE, BLOCK_SIZE-cnt);
- }
-
+ unsigned int brw;
if (dowrite) {
if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
buserr = 1;
break;
} else {
- if (cnt) {
- z80_read_block(disk_buffer, addr, cnt);
- addr = addr + cnt - TPA_BASE;
- }
- z80_read_block(disk_buffer+cnt, addr, BLOCK_SIZE - cnt);
+ z80_read_block(disk_buffer, addr, BLOCK_SIZE);
z80_bus_cmd(Release);
}
- res = f_write(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br);
+ res = f_write(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &brw);
} else {
- res = f_read(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &br);
- if (res == FR_OK && br == BLOCK_SIZE) {
+ res = f_read(&drv_table[drv].fd, disk_buffer, BLOCK_SIZE, &brw);
+ if (res == FR_OK && brw == BLOCK_SIZE) {
if (!(z80_bus_cmd(Request) & ZST_ACQUIRED)) {
buserr = 1;
break;
} else {
- if (cnt) {
- z80_write_block(disk_buffer, addr, cnt);
- addr = addr + cnt - TPA_BASE;
- }
- z80_write_block(disk_buffer+cnt, addr, BLOCK_SIZE - cnt);
+ z80_write_block(disk_buffer, addr, BLOCK_SIZE);
z80_bus_cmd(Release);
}
}
}
- if (br != BLOCK_SIZE) {
- debug_cpmsd("## %7lu f_read res: %d, bytes rd/wr: %u\n", get_timer(0), res, br);
+ if (brw != BLOCK_SIZE) {
+ debug_cpmsd("## %7lu f_read res: %d, bytes rd/wr: %u\n", get_timer(0), res, brw);
dump_ram(disk_buffer, 0, 64, "Read Data");
res = -1;
}
int msg_handling(int state)
{
- uint8_t pending;
+ bool pending;
ATOMIC_BLOCK(ATOMIC_FORCEON) {
pending = (Stat & S_MSG_PENDING) != 0;
Stat &= ~S_MSG_PENDING;
}
-/*
- * TODO: if pending but no message chr --> special condition. ie init,...
- */
if (pending) {
- switch (state) {
- case 0: /* need init */
- /* Get address of fifo_list */
+ uint8_t init_request;
+ z80_bus_cmd(Request);
+ init_request = z80_read(0x43);
+ z80_bus_cmd(Release);
+ if ( init_request != 0) {
+ /* Get address of fifo 0 */
z80_bus_cmd(Request);
- uint32_t fifo_list = z80_read(0x40) +
- ((uint16_t) z80_read(0x41) << 8) +
- ((uint32_t) z80_read(0x42) << 16);
+ uint32_t fifo_addr = z80_read(0x40) +
+ ((uint16_t) z80_read(0x40+1) << 8) +
+ ((uint32_t) z80_read(0x40+2) << 16);
+ z80_write(0x43, 0);
z80_bus_cmd(Release);
- if (fifo_list != 0) {
- /* Get address of fifo 0 */
- z80_bus_cmd(Request);
- uint32_t fifo_addr = z80_read(fifo_list) +
- ((uint16_t) z80_read(fifo_list+1) << 8) +
- ((uint32_t) z80_read(fifo_list+2) << 16);
- z80_bus_cmd(Release);
- if (fifo_addr != 0) {
- z80_memfifo_init(fifo_msgin, fifo_addr);
- state = 1;
- }
- }
- break;
- case 1: /* awaiting messages */
+
+ if (fifo_addr != 0) {
+ z80_memfifo_init(fifo_msgin, fifo_addr);
+ state = 1;
+ } else
+ state = 0;
+
+ } else {
check_msg_fifo();
- break;
}
}
void restart_z180_serv(void)
{
z80_bus_cmd(Request);
- z80_write(0x40, 0);
- z80_write(0x41, 0);
- z80_write(0x42, 0);
+ z80_memset(0x40, 0, 4);
z80_bus_cmd(Release);
for (int i = 0; i < NUM_FIFOS; i++)
projects / z180-stamp.git / blobdiff