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

Merge branch 'master' of git@github.com:optixx/snesram

Browse Source 
Conflicts:
	tools/ffsample/linux/diskio.c
This commit is contained in:
David Voswinkel
2009-05-28 14:47:20 +02:00
parent 23a5b777ec 660767c464
commit b6c8135749
35 changed files with 1270 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/ffsample/linux/Makefile
View File

@@ -18,12 +18,6 @@ $(bin): $(objs)
clean:
rm -rf $(bin) *.o
image32:
dd if=/dev/zero of=disk00.vfat bs=1M count=64
sudo mkfs.vfat -F 32 -v disk00.vfat
image_parted:
dd if=/dev/zero of=disk00.vfat bs=1M count=256
fdisk -H 32 -S 32 -C 500 disk00.vfat
@@ -48,19 +42,11 @@ image_not_parted:
sudo umount disk
sudo losetup -d /dev/loop0
image_no_fdisk:
dd if=/dev/zero of=disk00.vfat bs=1M count=256
sudo mkfs.vfat -I -f 2 -F 16 -v disk00.vfat
sudo mount -o loop disk00.vfat disk
sudo cp /var/log/*log disk/
sudo umount disk
image_no_dd:
image:
rm -fv disk00.vfat
mkfs.vfat -F 32 -v -C disk00.vfat 256000
sudo mount -o loop,check=s disk00.vfat disk
sudo cp -v /var/log/*log disk/
mkfs.vfat -I -F 16 -v -C disk00.vfat 256000
sudo mount -o loop disk00.vfat disk
sudo cp -v /var/log/*.log disk/
sudo umount disk
mount:
@@ -71,3 +57,8 @@ umount:
sudo umount disk
sudo losetup -d /dev/loop0
test:
echo "fi\nfs\nfl" | ./fftest
run:
rlwrap ./fftest

72
tools/ffsample/linux/diskio.c
View File

@@ -5,6 +5,7 @@
static volatile
DSTATUS Stat = STA_NOINIT; /* Disk status */
<<<<<<< HEAD:tools/ffsample/linux/diskio.c
/*
sudo losetup /dev/loop0 disk00.vfat
@@ -50,28 +51,24 @@ Signature: 0xAA55
3: 00 0 0 0 - 0 0 0 [ 0 - 0] unused
4: 00 0 0 0 - 0 0 0 [ 0 - 0] unused
*/
=======
>>>>>>> 660767c464c3d78d36436123eb2e717c3c85f6bc:tools/ffsample/linux/diskio.c
/* 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
*/
/*-----------------------------------------------------------------------*/
@@ -85,18 +82,16 @@ return 1 byte
#include <unistd.h>
#include <fcntl.h>
#include <sys/mman.h>
#include <string.h>
#define IMAGE_NAME "disk00.vfat"
int *image_addr;
char *image_addr;
DSTATUS disk_initialize (BYTE drv) {
if (drv) return STA_NOINIT; /* Supports only single drive */
Stat |= STA_NOINIT;
/* map image */
int fd = open(IMAGE_NAME, O_RDWR);
if (fd == -1) {
@@ -104,19 +99,17 @@ DSTATUS disk_initialize (BYTE drv) {
exit(EXIT_FAILURE);
}
int size = lseek(fd,0,SEEK_END);
lseek(fd,0,SEEK_SET);
printf("Open Image (size %i)\n",size);
//image_addr = mmap(0,fd,)
image_addr = 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;
}
@@ -147,13 +140,10 @@ DRESULT disk_read (
if (drv || !count) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
DWORD offset = sector * 512;
DWORD offset = sector * 512;
int size = count * 512;
printf("disk_read: sector=%li count=%i addr=%p size=%i\n",sector,count,image_addr + offset,size);
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);
//printf("%x %x %x %x\n",buff[0],buff[1],buff[2],buff[3]);
return RES_OK;
}
@@ -169,23 +159,14 @@ DRESULT disk_write (
BYTE count /* Sector count (1..255) */
)
{
BYTE s, c, iowr_l, iowr_h;
if (drv || !count) return RES_PARERR;
if (Stat & STA_NOINIT) return RES_NOTRDY;
/* Issue Write Setor(s) command */
/*
write_ata(REG_COUNT, count);
write_ata(REG_SECTOR, (BYTE)sector);
write_ata(REG_CYLL, (BYTE)(sector >> 8));
write_ata(REG_CYLH, (BYTE)(sector >> 16));
write_ata(REG_DEV, ((BYTE)(sector >> 24) & 0x0F) | LBA);
write_ata(REG_COMMAND, CMD_WRITE);
*/
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 */
@@ -223,38 +204,9 @@ DRESULT disk_ioctl (
*(DWORD*)buff = 32;
return RES_OK;
case CTRL_SYNC : /* Nothing to do */
printf("disk_ioctl: CTRL_SIZE\n");
return RES_OK;
case ATA_GET_REV : /* Get firmware revision (8 chars) */
printf("disk_ioctl: ATAL_GET_REV\n");
ofs = 23; w = 4; n = 4;
break;
case ATA_GET_MODEL : /* Get model name (40 chars) */
printf("disk_ioctl: ATAL_GET_MODEL\n");
ofs = 27; w = 20; n = 20;
break;
case ATA_GET_SN : /* Get serial number (20 chars) */
printf("disk_ioctl: ATAL_GET_SN\n");
ofs = 10; w = 10; n = 10;
break;
default:
return RES_PARERR;
}
/*
write_ata(REG_COMMAND, CMD_IDENTIFY);
if (!wait_data()) return RES_ERROR;
read_part(ptr, ofs, w);
while (n--) {
dl = *ptr; dh = *(ptr+1);
*ptr++ = dh; *ptr++ = dl;
}
*/
return RES_OK;
}
#endif /* _USE_IOCTL != 0 */

30
tools/ffsample/linux/diskio.h
View File

@@ -2,6 +2,11 @@
/ 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 */
@@ -56,26 +61,11 @@ void disk_timerproc (void);
#define CTRL_POWER 4
#define CTRL_LOCK 5
#define CTRL_EJECT 6
/* MMC/SDC command */
#define MMC_GET_TYPE 10
#define MMC_GET_CSD 11
#define MMC_GET_CID 12
#define MMC_GET_OCR 13
#define MMC_GET_SDSTAT 14
/* ATA/CF command */
#define ATA_GET_REV 20
#define ATA_GET_MODEL 21
#define ATA_GET_SN 22
/* Card type flags (CardType) */
#define CT_MMC 0x01
#define CT_SD1 0x02
#define CT_SD2 0x04
#define CT_SDC (CT_SD1|CT_SD2)
#define CT_BLOCK 0x08
#define _DISKIO
#endif
#ifdef __cplusplus
}
#endif

8
tools/ffsample/linux/ff.h
View File

@@ -25,7 +25,7 @@
#ifndef _FATFS
#define _FATFS
#define _WORD_ACCESS 1
#define _WORD_ACCESS 0
/* The _WORD_ACCESS option defines which access method is used to the word
/ data in the FAT structure.
/
@@ -60,7 +60,7 @@
/ data transfer. This reduces memory consumption 512 bytes each file object. */
#define _USE_STRFUNC 1
#define _USE_STRFUNC 0
/* To enable string functions, set _USE_STRFUNC to 1 or 2. */
@@ -81,13 +81,13 @@
/* 512 for memroy card and hard disk, 1024 for floppy disk, 2048 for MO disk */
#define _MULTI_PARTITION 1
#define _MULTI_PARTITION 0
/* When _MULTI_PARTITION is set to 0, each volume is bound to the same physical
/ drive number and can mount only first primaly partition. When it is set to 1,
/ each volume is tied to the partitions listed in Drives[]. */
#define _CODE_PAGE 850
#define _CODE_PAGE 437
/* The _CODE_PAGE specifies the OEM code page to be used on the target system.
/ When it is non LFN configuration, there is no difference between SBCS code
/ pages. When LFN is enabled, the code page must always be set correctly.

BIN
tools/ffsample/linux/fftest
View File

Binary file not shown.

18
tools/ffsample/linux/main.c
View File

@@ -118,7 +118,7 @@ FRESULT scan_files (char* path)
if ((res = f_opendir(&dirs, path)) == FR_OK) {
i = strlen(path);
printf("Ok\n");
//printf("Ok\n");
while (((res = f_readdir(&dirs, &finfo)) == FR_OK) && finfo.fname[0]) {
if (finfo.fattrib & AM_DIR) {
acc_dirs++;
@@ -241,22 +241,6 @@ int main (void)
{ printf("Sector size: %u\n", w1); }
if (disk_ioctl((BYTE)p1, GET_BLOCK_SIZE, &p2) == RES_OK)
{ printf("Erase block size: %lu sectors\n", p2); }
if (disk_ioctl((BYTE)p1, MMC_GET_TYPE, &b1) == RES_OK)
{ printf("Card type: %u\n", b1); }
if (disk_ioctl((BYTE)p1, MMC_GET_CSD, Buff) == RES_OK)
{ printf("CSD:\n"); put_dump(Buff, 0, 16); }
if (disk_ioctl((BYTE)p1, MMC_GET_CID, Buff) == RES_OK)
{ printf("CID:\n"); put_dump(Buff, 0, 16); }
if (disk_ioctl((BYTE)p1, MMC_GET_OCR, Buff) == RES_OK)
{ printf("OCR:\n"); put_dump(Buff, 0, 4); }
if (disk_ioctl((BYTE)p1, MMC_GET_SDSTAT, Buff) == RES_OK) {
printf("SD Status:\n");
for (s1 = 0; s1 < 64; s1 += 16) put_dump(Buff+s1, s1, 16);
}
if (disk_ioctl((BYTE)p1, ATA_GET_MODEL, line) == RES_OK)
{ line[40] = '\0'; printf("Model: %s\n", line); }
if (disk_ioctl((BYTE)p1, ATA_GET_SN, line) == RES_OK)
{ line[20] = '\0'; printf("S/N: %s\n", line); }
break;
}
break;