godzil/quickdev16
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

o add snes fatfs dummy

Browse Source 
o add fatfs custom chip to bsnes
o finishes fatfs linux backend smaple
This commit is contained in:
david
2009-05-26 17:07:39 +02:00
parent 0fd42d7b1d
commit 660767c464
33 changed files with 1241 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/bsnes/Makefile
View File

@@ -126,7 +126,7 @@ link += $(if $(findstring input.rawinput,$(ruby)),$(call mklib,xinput) $(call mk
objects = libco ruby libfilter string \
reader cart cheat \
memory smemory cpu scpu smp ssmp sdsp ppu bppu snes \
bsx srtc sdd1 spc7110 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010 cmmio
bsx srtc sdd1 spc7110 cx4 dsp1 dsp2 dsp3 dsp4 obc1 st010 cmmio fatfs diskio
ifeq ($(enable_gzip),true)
#objects += adler32 compress crc32 deflate gzio inffast inflate inftrees ioapi trees unzip zip zutil
@@ -237,6 +237,10 @@ obj/dsp4.$(obj) : chip/dsp4/dsp4.cpp chip/dsp4/*
obj/obc1.$(obj) : chip/obc1/obc1.cpp chip/obc1/*
obj/st010.$(obj) : chip/st010/st010.cpp chip/st010/*
obj/cmmio.$(obj) : chip/cmmio/cmmio.cpp chip/cmmio/*
obj/fatfs.$(obj) : chip/fatfs/fatfs.cpp chip/fatfs/*
obj/diskio.$(obj) : chip/fatfs/diskio.cpp chip/fatfs/*
############

1
tools/bsnes/chip/chip.hpp
View File

@@ -10,3 +10,4 @@
#include "obc1/obc1.hpp"
#include "st010/st010.hpp"
#include "cmmio/cmmio.hpp"
#include "fatfs/fatfs.hpp"

168
tools/bsnes/chip/fatfs/diskio.cpp Normal file
View File

@@ -0,0 +1,168 @@
#include "integer.h"
#include "diskio.h"
static volatile
DSTATUS Stat = STA_NOINIT; /* Disk status */
/* Interface
** Scratch Buffer
addr 3 byte
size 1 byte
** Call Interface
cmd 1 byte
sector 4 bytes
count 1 byte
return 1 byte
** Commands
* disk_init
* disk_read
* disk_write
*/
/*-----------------------------------------------------------------------*/
/* Initialize Disk Drive */
/*-----------------------------------------------------------------------*/
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <string.h>
#define IMAGE_NAME "disk00.vfat"
BYTE *image_addr;
DSTATUS disk_initialize (BYTE drv) {
if (drv) return STA_NOINIT; /* Supports only single drive */
Stat |= STA_NOINIT;
int fd = open(IMAGE_NAME, O_RDWR);
if (fd == -1) {
perror("Error opening file for writing");
exit(EXIT_FAILURE);
}
int size = lseek(fd,0,SEEK_END);
lseek(fd,0,SEEK_SET);
printf("Open Image (size %i)\n",size);
image_addr = (BYTE*)mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (image_addr == MAP_FAILED) {
close(fd);
perror("Error mmapping the file");
exit(EXIT_FAILURE);
}
Stat &= ~STA_NOINIT; /* When device goes ready, clear STA_NOINIT */
return Stat;
}
/*-----------------------------------------------------------------------*/
/* Return Disk Status */
/*-----------------------------------------------------------------------*/
DSTATUS disk_status (BYTE drv){
if (drv) return STA_NOINIT; /* Supports only single drive */
return Stat;
}
/*-----------------------------------------------------------------------*/
/* Read Sector(s) */
/*-----------------------------------------------------------------------*/
DRESULT disk_read (
BYTE drv, /* Physical drive nmuber (0) */
BYTE *buff, /* Data buffer to store read data */
DWORD sector, /* Sector number (LBA) */
BYTE count /* Sector count (1..255) */
)
{
BYTE c, iord_l, iord_h;
if (drv || !count) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
DWORD offset = sector * 512;
int size = count * 512;
printf("disk_read: sector=%li count=%i addr=%p off=%li size=%i\n",sector,count,image_addr + offset,offset,size);
memcpy(buff,image_addr + offset,size);
return RES_OK;
}
/*-----------------------------------------------------------------------*/
/* Write Sector(s) */
/*-----------------------------------------------------------------------*/
#if _READONLY == 0
DRESULT disk_write (
BYTE drv, /* Physical drive nmuber (0) */
const BYTE *buff, /* Data to be written */
DWORD sector, /* Sector number (LBA) */
BYTE count /* Sector count (1..255) */
)
{
if (drv || !count) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
DWORD offset = sector * 512;
int size = count * 512;
printf("disk_write: sector=%li count=%i addr=%p off=%li size=%i\n",sector,count,image_addr + offset,offset,size);
memcpy(image_addr + offset,buff,size);
return RES_OK;
}
#endif /* _READONLY */
/*-----------------------------------------------------------------------*/
/* Miscellaneous Functions */
/*-----------------------------------------------------------------------*/
#if _USE_IOCTL != 0
DRESULT disk_ioctl (
BYTE drv, /* Physical drive nmuber (0) */
BYTE ctrl, /* Control code */
void *buff /* Buffer to send/receive data block */
)
{
BYTE n, w, ofs, dl, dh, *ptr = (BYTE*)buff;
if (drv) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
switch (ctrl) {
case GET_SECTOR_COUNT : /* Get number of sectors on the disk (DWORD) */
printf("disk_ioctl: GET_SECTOR_COUNT\n");
ofs = 60; w = 2; n = 0;
break;
case GET_SECTOR_SIZE : /* Get sectors on the disk (WORD) */
printf("disk_ioctl: GET_SECTOR_SIZE\n");
*(WORD*)buff = 512;
return RES_OK;
case GET_BLOCK_SIZE : /* Get erase block size in sectors (DWORD) */
printf("disk_ioctl: GET_BLOCK_SIZE\n");
*(DWORD*)buff = 32;
return RES_OK;
default:
return RES_PARERR;
}
return RES_OK;
}
#endif /* _USE_IOCTL != 0 */

71
tools/bsnes/chip/fatfs/diskio.h Normal file
View File

@@ -0,0 +1,71 @@
/*-----------------------------------------------------------------------
/ Low level disk interface modlue include file R0.05 (C)ChaN, 2007
/-----------------------------------------------------------------------*/
#ifdef __cplusplus
extern "C" {
#endif
#ifndef _DISKIO
#define _READONLY 0 /* 1: Read-only mode */
#define _USE_IOCTL 1
#include "integer.h"
/* Status of Disk Functions */
typedef BYTE DSTATUS;
/* Results of Disk Functions */
typedef enum {
RES_OK = 0, /* 0: Successful */
RES_ERROR, /* 1: R/W Error */
RES_WRPRT, /* 2: Write Protected */
RES_NOTRDY, /* 3: Not Ready */
RES_PARERR /* 4: Invalid Parameter */
} DRESULT;
/*---------------------------------------*/
/* Prototypes for disk control functions */
DSTATUS disk_initialize (BYTE);
DSTATUS disk_status (BYTE);
DRESULT disk_read (BYTE, BYTE*, DWORD, BYTE);
#if _READONLY == 0
DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
#endif
DRESULT disk_ioctl (BYTE, BYTE, void*);
void disk_timerproc (void);
/* Disk Status Bits (DSTATUS) */
#define STA_NOINIT 0x01 /* Drive not initialized */
#define STA_NODISK 0x02 /* No medium in the drive */
#define STA_PROTECT 0x04 /* Write protected */
/* Command code for disk_ioctrl() */
/* Generic command */
#define CTRL_SYNC 0 /* Mandatory for write functions */
#define GET_SECTOR_COUNT 1 /* Mandatory for only f_mkfs() */
#define GET_SECTOR_SIZE 2
#define GET_BLOCK_SIZE 3 /* Mandatory for only f_mkfs() */
#define CTRL_POWER 4
#define CTRL_LOCK 5
#define CTRL_EJECT 6
#define _DISKIO
#endif
#ifdef __cplusplus
}
#endif

116
tools/bsnes/chip/fatfs/fatfs.cpp Normal file
View File

@@ -0,0 +1,116 @@
#include <../base.hpp>
#include <../cart/cart.hpp>
#include "fatfs.hpp"
#include "diskio.h"
#define CMD_INIT 0x00
#define CMD_READ 0x01
#define CMD_WRITE 0x02
#define CMD_NONE 0xff
#define SHARED_SIZE 512
#define SHARED_ADDR 0x3f0000
void FATFS::init() {
command = CMD_NONE;
sector = 0;
count = 0;
retval = -1;
scratch_buffer = (char*)malloc(SHARED_SIZE);
}
void FATFS::enable() {
// command
memory::mmio.map(0x3010, *this);
// sector
memory::mmio.map(0x3011, *this);
memory::mmio.map(0x3012, *this);
memory::mmio.map(0x3013, *this);
memory::mmio.map(0x3014, *this);
// offset
memory::mmio.map(0x3015, *this);
// return value
memory::mmio.map(0x3016, *this);
}
void FATFS::power() {
reset();
}
void FATFS::reset() {
}
void FATFS::fetchMem() {
for ( int i=0;i<SHARED_SIZE;i++){
scratch_buffer[i] = bus.read(SHARED_ADDR + i);
}
}
void FATFS::pushMem() {
for ( int i=0;i<SHARED_SIZE;i++){
bus.write(SHARED_ADDR + i,scratch_buffer[i]);
}
}
uint8 FATFS::mmio_read(unsigned addr) {
addr &= 0xffff;
if (addr == 0x3016){
printf("FATFS::mmio_read retal=%i\n",retval);
return retval;
}
return cpu.regs.mdr;
}
void FATFS::mmio_write(unsigned addr, uint8 data) {
addr &= 0xffff;
printf("FATFS::mmio_write 0x%04x 0x%02x (%i)\n",addr,data,data);
if (addr == 0x3010){
switch(data){
case CMD_INIT:
printf("FATFS::mmio_write CMD_INIT \n");
command = CMD_INIT;
disk_initialize(0);
break;
case CMD_READ:
printf("FATFS::mmio_write CMD_READ \n");
command = CMD_READ;
break;
case CMD_WRITE:
command = CMD_WRITE;
printf("FATFS::mmio_write CMD_WRITE \n");
break;
default:
command = CMD_NONE;
printf("FATFS::mmio_write CMD_NONE \n");
break;
}
fflush(stderr);
}
if (addr >= 0x3011 && addr <= 0x3014){
sector = data << ( (3 - ( addr - 0x3011)) << 3);
printf("FATFS::mmio_write set sector: byte=%i val=%i sector=%i \n",(3 - ( addr - 0x3011)),data,sector);
}
if (addr == 0x3015){
count = data;
printf("FATFS::mmio_write set offset: countr=%i \n",count);
if (command == CMD_READ) {
retval = disk_read (0, (BYTE*)scratch_buffer, sector, count);
if (!retval)
pushMem();
} else if (command == CMD_WRITE) {
fetchMem();
retval = disk_write (0, (BYTE*)scratch_buffer, sector, count);
} else{
printf("FATFS::mmio_write set offset: no command to trigger \n");
}
}
if (addr == 0x3016){
printf("FATFS::mmio_write reg 0x3016 retav is RW\n");
}
}
FATFS::FATFS() {
}

26
tools/bsnes/chip/fatfs/fatfs.hpp Normal file
View File

@@ -0,0 +1,26 @@
class FATFS : public MMIO {
public:
void init();
void enable();
void power();
void reset();
void fetchMem();
void pushMem();
uint8 mmio_read (unsigned addr);
void mmio_write(unsigned addr, uint8 data);
FATFS();
private:
char command;
int sector;
char count;
char retval;
char *scratch_buffer;
};
extern FATFS fatfs;

37
tools/bsnes/chip/fatfs/integer.h Normal file
View File

@@ -0,0 +1,37 @@
/*-------------------------------------------*/
/* Integer type definitions for FatFs module */
/*-------------------------------------------*/
#ifndef _INTEGER
#if 0
#include <windows.h>
#else
/* These types must be 16-bit, 32-bit or larger integer */
typedef int INT;
typedef unsigned int UINT;
/* These types must be 8-bit integer */
typedef signed char CHAR;
typedef unsigned char UCHAR;
typedef unsigned char BYTE;
/* These types must be 16-bit integer */
typedef short SHORT;
typedef unsigned short USHORT;
typedef unsigned short WORD;
typedef unsigned short WCHAR;
/* These types must be 32-bit integer */
typedef long LONG;
typedef unsigned long ULONG;
typedef unsigned long DWORD;
/* Boolean type */
typedef enum { FALSE = 0, TRUE } BOOL;
#endif
#define _INTEGER
#endif

3
tools/bsnes/snes/snes.cpp
View File

@@ -24,6 +24,7 @@ DSP4 dsp4;
OBC1 obc1;
ST010 st010;
CMMIO cmmio;
FATFS fatfs;
#include "scheduler/scheduler.cpp"
#include "tracer/tracer.cpp"
@@ -101,6 +102,7 @@ void SNES::power() {
if(cartridge.has_st010()) st010.power();
cmmio.power();
fatfs.power();
for(unsigned i = 0x2100; i <= 0x213f; i++) memory::mmio.map(i, ppu);
for(unsigned i = 0x2140; i <= 0x217f; i++) memory::mmio.map(i, cpu);
@@ -125,6 +127,7 @@ void SNES::power() {
if(cartridge.has_st010()) st010.enable();
cmmio.enable();
fatfs.enable();
input.port_set_device(0, snes.config.controller_port1);
input.port_set_device(1, snes.config.controller_port2);