Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 3 commits
  • 14 files changed
  • 0 commit comments
  • 1 contributor
View
5 software/bios/Makefile
@@ -1,5 +1,5 @@
M2DIR=../..
-include $(M2DIR)/software/include.mak
+include $(M2DIR)/software/common.mak
OBJECTS=crt0.o isr.o ddrinit.o main.o microudp.o tftp.o boot-helper.o boot.o
@@ -18,12 +18,11 @@ bios.elf: linker.ld $(OBJECTS) libs
bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs
%.elf:
- $(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -L$(M2DIR)/software/libextra -lbase -lextra
+ $(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -lbase
chmod -x $@
libs:
make -C $(M2DIR)/software/libbase
- make -C $(M2DIR)/software/libextra
flash: bios.bin
m1nor bios.bin
View
2  software/bios/boot.c
@@ -20,7 +20,7 @@
#include <uart.h>
#include <system.h>
#include <board.h>
-#include <extra/crc.h>
+#include <crc.h>
#include <sfl.h>
#include <string.h>
#include <irq.h>
View
2  software/bios/main.c
@@ -23,7 +23,7 @@
#include <board.h>
#include <irq.h>
#include <version.h>
-#include <extra/crc.h>
+#include <crc.h>
#include <timer.h>
#include <hw/flash.h>
View
2  software/bios/microudp.c
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <system.h>
-#include <extra/crc.h>
+#include <crc.h>
#include <hw/minimac.h>
#include "microudp.h"
View
0  software/include.mak → software/common.mak
File renamed without changes
View
0  software/include/extra/crc.h → software/include/base/crc.h
File renamed without changes
View
31 software/include/extra/blockdev.h
@@ -1,31 +0,0 @@
-/*
- * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __BLOCKDEV_H
-#define __BLOCKDEV_H
-
-enum {
- BLOCKDEV_MEMORY_CARD
-};
-
-int bd_init(int devnr);
-int bd_readblock(unsigned int block, void *buffer);
-void bd_done(void);
-
-int bd_has_part_table(int devnr);
-
-#endif /* __BLOCKDEV_H */
View
28 software/include/extra/fatfs.h
@@ -1,28 +0,0 @@
-/*
- * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __FATFS_H
-#define __FATFS_H
-
-typedef int (*fatfs_dir_callback)(const char *, const char *, void *);
-
-int fatfs_init(int devnr);
-int fatfs_list_files(fatfs_dir_callback cb, void *param);
-int fatfs_load(const char *filename, char *buffer, int size, int *realsize);
-void fatfs_done(void);
-
-#endif /* __FATFS_H */
View
4 software/libbase/Makefile
@@ -1,7 +1,7 @@
M2DIR=../..
-include $(M2DIR)/software/include.mak
+include $(M2DIR)/software/common.mak
-OBJECTS=divsi3.o libc.o console.o timer.o system.o board.o uart.o softfloat.o softfloat-glue.o vsnprintf.o atof.o
+OBJECTS=divsi3.o libc.o crc16.o crc32.o console.o timer.o system.o board.o uart.o softfloat.o softfloat-glue.o vsnprintf.o atof.o
all: libbase.a
View
2  software/libextra/crc16.c → software/libbase/crc16.c
@@ -1,4 +1,4 @@
-#include <extra/crc.h>
+#include <crc.h>
static const unsigned int crc16_table[256] = {
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
View
2  software/libextra/crc32.c → software/libbase/crc32.c
@@ -3,7 +3,7 @@
* For conditions of distribution and use, see copyright notice in zlib.h
*/
-#include <extra/crc.h>
+#include <crc.h>
static const unsigned int crc_table[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
View
18 software/libextra/Makefile
@@ -1,18 +0,0 @@
-M2DIR=../..
-include $(M2DIR)/software/include.mak
-
-OBJECTS=crc16.o crc32.o
-
-all: libextra.a
-
-# pull in dependency info for *existing* .o files
--include $(OBJECTS:.o=.d)
-
-libextra.a: $(OBJECTS)
- $(AR) clr libextra.a $(OBJECTS)
- $(RANLIB) libextra.a
-
-.PHONY: clean
-
-clean:
- rm -f $(OBJECTS) $(OBJECTS:.o=.d) libextra.a .*~ *~
View
273 software/libextra/blockdev.c
@@ -1,273 +0,0 @@
-/*
- * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <hw/flash.h>
-#include <hw/memcard.h>
-#include <string.h>
-
-#include <blockdev.h>
-
-//#define MEMCARD_DEBUG
-
-static void memcard_start_cmd_tx(void)
-{
- CSR_MEMCARD_ENABLE = MEMCARD_ENABLE_CMD_TX;
-}
-
-static void memcard_start_cmd_rx(void)
-{
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_CMD_RX;
- CSR_MEMCARD_START = MEMCARD_START_CMD_RX;
- CSR_MEMCARD_ENABLE = MEMCARD_ENABLE_CMD_RX;
-}
-
-static void memcard_start_cmd_dat_rx(void)
-{
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_CMD_RX|MEMCARD_PENDING_DAT_RX;
- CSR_MEMCARD_START = MEMCARD_START_CMD_RX|MEMCARD_START_DAT_RX;
- CSR_MEMCARD_ENABLE = MEMCARD_ENABLE_CMD_RX|MEMCARD_ENABLE_DAT_RX;
-}
-
-static void memcard_send_command(unsigned char cmd, unsigned int arg)
-{
- unsigned char packet[6];
- int a;
- int i;
- unsigned char data;
- unsigned char crc;
-
- packet[0] = cmd | 0x40;
- packet[1] = ((arg >> 24) & 0xff);
- packet[2] = ((arg >> 16) & 0xff);
- packet[3] = ((arg >> 8) & 0xff);
- packet[4] = (arg & 0xff);
-
- crc = 0;
- for(a=0;a<5;a++) {
- data = packet[a];
- for(i=0;i<8;i++) {
- crc <<= 1;
- if((data & 0x80) ^ (crc & 0x80))
- crc ^= 0x09;
- data <<= 1;
- }
- }
- crc = (crc<<1) | 1;
-
- packet[5] = crc;
-
-#ifdef MEMCARD_DEBUG
- printf(">> %02x %02x %02x %02x %02x %02x\n", packet[0], packet[1], packet[2], packet[3], packet[4], packet[5]);
-#endif
-
- for(i=0;i<6;i++) {
- CSR_MEMCARD_CMD = packet[i];
- while(CSR_MEMCARD_PENDING & MEMCARD_PENDING_CMD_TX);
- }
-}
-
-static void memcard_send_dummy(void)
-{
- CSR_MEMCARD_CMD = 0xff;
- while(CSR_MEMCARD_PENDING & MEMCARD_PENDING_CMD_TX);
-}
-
-static int memcard_receive_command(unsigned char *buffer, int len)
-{
- int i;
- int timeout;
-
- for(i=0;i<len;i++) {
- timeout = 2000000;
- while(!(CSR_MEMCARD_PENDING & MEMCARD_PENDING_CMD_RX)) {
- timeout--;
- if(timeout == 0) {
- #ifdef MEMCARD_DEBUG
- printf("Command receive timeout\n");
- #endif
- return 0;
- }
- }
- buffer[i] = CSR_MEMCARD_CMD;
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_CMD_RX;
- }
-
- while(!(CSR_MEMCARD_PENDING & MEMCARD_PENDING_CMD_RX));
-
- #ifdef MEMCARD_DEBUG
- printf("<< ");
- for(i=0;i<len;i++)
- printf("%02x ", buffer[i]);
- printf("\n");
- #endif
-
- return 1;
-}
-
-static int memcard_receive_command_data(unsigned char *command, unsigned int *data)
-{
- int i, j;
- int timeout;
-
- i = 0;
- j = 0;
- while(j < 128) {
- timeout = 2000000;
- while(!(CSR_MEMCARD_PENDING & (MEMCARD_PENDING_CMD_RX|MEMCARD_PENDING_DAT_RX))) {
- timeout--;
- if(timeout == 0) {
- #ifdef MEMCARD_DEBUG
- printf("Command receive timeout\n");
- #endif
- return 0;
- }
- }
- if(CSR_MEMCARD_PENDING & MEMCARD_PENDING_CMD_RX) {
- command[i++] = CSR_MEMCARD_CMD;
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_CMD_RX;
- if(i == 6)
- CSR_MEMCARD_ENABLE = MEMCARD_ENABLE_DAT_RX; /* disable command RX */
- }
- if(CSR_MEMCARD_PENDING & MEMCARD_PENDING_DAT_RX) {
- data[j++] = CSR_MEMCARD_DAT;
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_DAT_RX;
- }
- }
-
- /* Get CRC (ignored) */
- for(i=0;i<2;i++) {
- while(!(CSR_MEMCARD_PENDING & MEMCARD_PENDING_DAT_RX));
- #ifdef MEMCARD_DEBUG
- printf("CRC: %08x\n", CSR_MEMCARD_DAT);
- #endif
- CSR_MEMCARD_PENDING = MEMCARD_PENDING_DAT_RX;
- }
-
- while(!(CSR_MEMCARD_PENDING & MEMCARD_PENDING_DAT_RX));
-
- #ifdef MEMCARD_DEBUG
- printf("<< %02x %02x %02x %02x %02x %02x\n", command[0], command[1], command[2], command[3], command[4], command[5]);
- #endif
-
- //for(i=0;i<128;i++)
- // printf("%08x ", data[i]);
- //printf("\n");
-
- return 1;
-}
-
-static int memcard_init(void)
-{
- unsigned char b[17];
- unsigned int rca;
-
- CSR_MEMCARD_CLK2XDIV = 250;
-
- /* CMD0 */
- memcard_start_cmd_tx();
- memcard_send_command(0, 0);
-
- memcard_send_dummy();
-
- /* CMD8 */
- memcard_send_command(8, 0x1aa);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
-
- /* ACMD41 - initialize */
- while(1) {
- memcard_start_cmd_tx();
- memcard_send_command(55, 0);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
- memcard_start_cmd_tx();
- memcard_send_command(41, 0x00300000);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
- if(b[1] & 0x80) break;
- #ifdef MEMCARD_DEBUG
- printf("Card is busy, retrying\n");
- #endif
- }
-
- /* CMD2 - get CID */
- memcard_start_cmd_tx();
- memcard_send_command(2, 0);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 17)) return 0;
-
- /* CMD3 - get RCA */
- memcard_start_cmd_tx();
- memcard_send_command(3, 0);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
- rca = (((unsigned int)b[1]) << 8)|((unsigned int)b[2]);
- #ifdef MEMCARD_DEBUG
- printf("RCA: %04x\n", rca);
- #endif
-
- /* CMD7 - select card */
- memcard_start_cmd_tx();
- memcard_send_command(7, rca << 16);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
-
- /* ACMD6 - set bus width */
- memcard_start_cmd_tx();
- memcard_send_command(55, rca << 16);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
- memcard_start_cmd_tx();
- memcard_send_command(6, 2);
- memcard_start_cmd_rx();
- if(!memcard_receive_command(b, 6)) return 0;
-
- CSR_MEMCARD_CLK2XDIV = 3;
-
- return 1;
-}
-
-static int memcard_readblock(unsigned int block, void *buffer)
-{
- unsigned char b[6];
-
- /* CMD17 - read block */
- memcard_start_cmd_tx();
- memcard_send_command(17, block*512);
- memcard_start_cmd_dat_rx();
- if(!memcard_receive_command_data(b, (unsigned int *)buffer)) return 0;
- return 1;
-}
-
-int bd_init(int devnr)
-{
- return memcard_init();
-}
-
-int bd_readblock(unsigned int block, void *buffer)
-{
- return memcard_readblock(block, buffer);
-}
-
-void bd_done(void)
-{
-}
-
-int bd_has_part_table(int devnr)
-{
- return 1;
-}
View
440 software/libextra/fatfs.c
@@ -1,440 +0,0 @@
-/*
- * Milkymist SoC (Software)
- * Copyright (C) 2007, 2008, 2009, 2010 Sebastien Bourdeauducq
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <endian.h>
-#include <console.h>
-#include <blockdev.h>
-
-#include <fatfs.h>
-
-//#define DEBUG
-
-#define BLOCK_SIZE 512
-
-struct partition_descriptor {
- unsigned char flags;
- unsigned char start_head;
- unsigned short start_cylinder;
- unsigned char type;
- unsigned char end_head;
- unsigned short end_cylinder;
- unsigned int start_sector;
- unsigned int end_sector;
-} __attribute__((packed));
-
-struct firstsector {
- unsigned char bootsector[446];
- struct partition_descriptor partitions[4];
- unsigned char signature[2];
-} __attribute__((packed));
-
-
-struct fat16_firstsector {
- /* Common to FATxx */
- char jmp[3];
- char oem[8];
- unsigned short bytes_per_sector;
- unsigned char sectors_per_cluster;
- unsigned short reserved_sectors;
- unsigned char number_of_fat;
- unsigned short max_root_entries;
- unsigned short total_sectors_short;
- unsigned char media_descriptor;
- unsigned short sectors_per_fat;
- unsigned short sectors_per_track;
- unsigned short head_count;
- unsigned int hidden_sectors;
- unsigned int total_sectors;
-
- /* FAT16 specific */
- unsigned char drive_nr;
- unsigned char reserved;
- unsigned char ext_boot_signature;
- unsigned int id;
- unsigned char volume_label[11];
- unsigned char fstype[8];
- unsigned char bootcode[448];
- unsigned char signature[2];
-} __attribute__((packed));
-
-struct directory_entry {
- unsigned char filename[8];
- unsigned char extension[3];
- unsigned char attributes;
- unsigned char reserved;
- unsigned char create_time_ms;
- unsigned short create_time;
- unsigned short create_date;
- unsigned short last_access;
- unsigned short ea_index;
- unsigned short lastm_time;
- unsigned short lastm_date;
- unsigned short first_cluster;
- unsigned int file_size;
-} __attribute__((packed));
-
-struct directory_entry_lfn {
- unsigned char seq;
- unsigned short name1[5]; /* UTF16 */
- unsigned char attributes;
- unsigned char reserved;
- unsigned char checksum;
- unsigned short name2[6];
- unsigned short first_cluster;
- unsigned short name3[2];
-} __attribute__((packed));
-
-#define PARTITION_TYPE_FAT16 0x06
-#define PARTITION_TYPE_FAT32 0x0b
-
-static int fatfs_partition_start_sector; /* Sector# of the beginning of the FAT16 partition */
-
-static int fatfs_sectors_per_cluster;
-static int fatfs_fat_sector; /* Sector of the first FAT */
-static int fatfs_fat_entries; /* Number of entries in the FAT */
-static int fatfs_max_root_entries;
-static int fatfs_root_table_sector; /* Sector# of the beginning of the root table */
-
-static int fatfs_fat_cached_sector;
-static unsigned short int fatfs_fat_sector_cache[BLOCK_SIZE/2];
-
-static int fatfs_dir_cached_sector;
-static struct directory_entry fatfs_dir_sector_cache[BLOCK_SIZE/sizeof(struct directory_entry)];
-
-static int fatfs_data_start_sector;
-
-int fatfs_init(int devnr)
-{
- struct firstsector s0;
- struct fat16_firstsector s;
- int i;
-
- if(!bd_init(devnr)) {
- printf("E: Unable to initialize memory card driver\n");
- return 0;
- }
-
- if(bd_has_part_table(devnr)) {
- /* Read sector 0, with partition table */
- if(!bd_readblock(0, (void *)&s0)) {
- printf("E: Unable to read block 0\n");
- return 0;
- }
-
- fatfs_partition_start_sector = -1;
- for(i=0;i<4;i++)
- if((s0.partitions[i].type == PARTITION_TYPE_FAT16)
- ||(s0.partitions[i].type == PARTITION_TYPE_FAT32)) {
-#ifdef DEBUG
- printf("I: Using partition #%d: start sector %08x, end sector %08x\n", i,
- le32toh(s0.partitions[i].start_sector), le32toh(s0.partitions[i].end_sector));
-#endif
- fatfs_partition_start_sector = le32toh(s0.partitions[i].start_sector);
- break;
- }
- if(fatfs_partition_start_sector == -1) {
- printf("E: No FAT partition was found\n");
- return 0;
- }
- } else
- fatfs_partition_start_sector = 0;
-
- /* Read first FAT16 sector */
- if(!bd_readblock(fatfs_partition_start_sector, (void *)&s)) {
- printf("E: Unable to read first FAT sector\n");
- return 0;
- }
-
-#ifdef DEBUG
- {
- char oem[9];
- char volume_label[12];
- memcpy(oem, s.oem, 8);
- oem[8] = 0;
- memcpy(volume_label, s.volume_label, 11);
- volume_label[11] = 0;
- printf("I: OEM name: %s\n", oem);
- printf("I: Volume label: %s\n", volume_label);
- }
-#endif
-
- if(le16toh(s.bytes_per_sector) != BLOCK_SIZE) {
- printf("E: Unexpected number of bytes per sector (%d)\n", le16toh(s.bytes_per_sector));
- return 0;
- }
- fatfs_sectors_per_cluster = s.sectors_per_cluster;
-
- fatfs_fat_entries = (le16toh(s.sectors_per_fat)*BLOCK_SIZE)/2;
- fatfs_fat_sector = fatfs_partition_start_sector + 1;
- fatfs_fat_cached_sector = -1;
-
- fatfs_max_root_entries = le16toh(s.max_root_entries);
- fatfs_root_table_sector = fatfs_fat_sector + s.number_of_fat*le16toh(s.sectors_per_fat);
- fatfs_dir_cached_sector = -1;
-
- fatfs_data_start_sector = fatfs_root_table_sector + (fatfs_max_root_entries*sizeof(struct directory_entry))/BLOCK_SIZE;
-
- if(fatfs_max_root_entries == 0) {
- printf("E: Your memory card uses FAT32, which is not supported.\n");
- printf("E: Please reformat your card using FAT16, e.g. use mkdosfs -F 16\n");
- printf("E: FAT32 support would be an appreciated contribution.\n");
- return 0;
- }
-
-#ifdef DEBUG
- printf("I: Cluster is %d sectors, FAT has %d entries, FAT 1 is at sector %d,\nI: root table is at sector %d (max %d), data is at sector %d, nb of fat: %d\n",
- fatfs_sectors_per_cluster, fatfs_fat_entries, fatfs_fat_sector,
- fatfs_root_table_sector, fatfs_max_root_entries,
- fatfs_data_start_sector, s.number_of_fat);
-#endif
- return 1;
-}
-
-static int fatfs_read_fat(int offset)
-{
- int wanted_sector;
-
- if((offset < 0) || (offset >= fatfs_fat_entries)) {
- printf("E: Incorrect offset %d in fatfs_read_fat\n", offset);
- return -1;
- }
-
- wanted_sector = fatfs_fat_sector + (offset*2)/BLOCK_SIZE;
- if(wanted_sector != fatfs_fat_cached_sector) {
- if(!bd_readblock(wanted_sector, (void *)&fatfs_fat_sector_cache)) {
- printf("E: Memory card failed (FAT), sector %d\n", wanted_sector);
- return -1;
- }
- fatfs_fat_cached_sector = wanted_sector;
- }
-
- return le16toh(fatfs_fat_sector_cache[offset % (BLOCK_SIZE/2)]);
-}
-
-static const struct directory_entry *fatfs_read_root_directory(int offset)
-{
- int wanted_sector;
-
- if((offset < 0) || (offset >= fatfs_max_root_entries))
- return NULL;
-
- wanted_sector = fatfs_root_table_sector + (offset*sizeof(struct directory_entry))/BLOCK_SIZE;
-
- if(wanted_sector != fatfs_dir_cached_sector) {
- if(!bd_readblock(wanted_sector, (void *)&fatfs_dir_sector_cache)) {
- printf("E: Memory card failed (Rootdir), sector %d\n", wanted_sector);
- return NULL;
- }
- fatfs_dir_cached_sector = wanted_sector;
- }
- return &fatfs_dir_sector_cache[offset % (BLOCK_SIZE/sizeof(struct directory_entry))];
-}
-
-static void lfn_to_ascii(const struct directory_entry_lfn *entry, char *name, int terminate)
-{
- int i;
- unsigned short c;
-
- for(i=0;i<5;i++) {
- c = le16toh(entry->name1[i]);
- if(c <= 255) {
- *name = c;
- name++;
- if(c == 0) return;
- }
- }
- for(i=0;i<6;i++) {
- c = le16toh(entry->name2[i]);
- if(c <= 255) {
- *name = c;
- name++;
- if(c == 0) return;
- }
- }
- for(i=0;i<2;i++) {
- c = le16toh(entry->name3[i]);
- if(c <= 255) {
- *name = c;
- name++;
- if(c == 0) return;
- }
- }
-
- if(terminate)
- *name = 0;
-}
-
-static int fatfs_is_regular(const struct directory_entry *entry)
-{
- return ((entry->attributes & 0x10) == 0)
- && ((entry->attributes & 0x08) == 0)
- && (entry->filename[0] != 0xe5);
-}
-
-int fatfs_list_files(fatfs_dir_callback cb, void *param)
-{
- const struct directory_entry *entry;
- char fmtbuf[8+1+3+1];
- char longname[131];
- int has_longname;
- int i, j, k;
-
- has_longname = 0;
- longname[sizeof(longname)-1] = 0; /* avoid crashing when reading a corrupt FS */
- for(k=0;k<fatfs_max_root_entries;k++) {
- entry = fatfs_read_root_directory(k);
-#ifdef DEBUG
- printf("I: Read entry with attribute %02x\n", entry->attributes);
-#endif
- if(entry->attributes == 0x0f) {
- const struct directory_entry_lfn *entry_lfn;
- unsigned char frag;
- int terminate;
-
- entry_lfn = (const struct directory_entry_lfn *)entry;
- frag = entry_lfn->seq & 0x3f;
- terminate = entry_lfn->seq & 0x40;
- if(frag*13 < sizeof(longname)) {
- lfn_to_ascii((const struct directory_entry_lfn *)entry, &longname[(frag-1)*13], terminate);
- if(frag == 1) has_longname = 1;
- }
- continue;
- } else {
- if(!fatfs_is_regular(entry)) {
- has_longname = 0;
- continue;
- }
- }
- if(entry == NULL) return 0;
- if(entry->filename[0] == 0) {
- has_longname = 0;
- break;
- }
- j = 0;
- for(i=0;i<8;i++) {
- if(entry->filename[i] == ' ') break;
- fmtbuf[j++] = entry->filename[i];
- }
- fmtbuf[j++] = '.';
- for(i=0;i<3;i++) {
- if(entry->extension[i] == ' ') break;
- fmtbuf[j++] = entry->extension[i];
- }
- fmtbuf[j++] = 0;
- if(!cb(fmtbuf, has_longname ? longname : fmtbuf, param)) return 0;
- has_longname = 0;
- }
- return 1;
-}
-
-static const struct directory_entry *fatfs_find_file_by_name(const char *filename)
-{
- char searched_filename[8];
- char searched_extension[3];
- char *dot;
- const char *c;
- int i;
- const struct directory_entry *entry;
-
- dot = strrchr(filename, '.');
- if(dot == NULL)
- return NULL;
-
- memset(searched_filename, ' ', 8);
- memset(searched_extension, ' ', 3);
- i = 0;
- for(c=filename;c<dot;c++)
- searched_filename[i++] = toupper(*c);
-
- i = 0;
- for(c=dot+1;*c!=0;c++)
- searched_extension[i++] = toupper(*c);
-
- for(i=0;i<fatfs_max_root_entries;i++) {
- entry = fatfs_read_root_directory(i);
- if(entry == NULL) break;
- if(entry->filename[0] == 0) break;
- if(!fatfs_is_regular(entry)) continue;
- if(!memcmp(searched_filename, entry->filename, 8)
- &&!memcmp(searched_extension, entry->extension, 3))
- return entry;
- }
- return NULL;
-}
-
-static int fatfs_load_cluster(int clustern, char *buffer, int maxsectors)
-{
- int startsector;
- int i;
- int toread;
-
- clustern = clustern - 2;
- startsector = fatfs_data_start_sector + clustern*fatfs_sectors_per_cluster;
- if(maxsectors < fatfs_sectors_per_cluster)
- toread = maxsectors;
- else
- toread = fatfs_sectors_per_cluster;
- for(i=0;i<toread;i++)
- if(!bd_readblock(startsector+i, (unsigned char *)buffer+i*BLOCK_SIZE)) {
- printf("E: Memory card failed (Cluster), sector %d\n", startsector+i);
- return 0;
- }
- return 1;
-}
-
-int fatfs_load(const char *filename, char *buffer, int size, int *realsize)
-{
- const struct directory_entry *entry;
- int cluster_size;
- int cluster;
- int n;
-
- cluster_size = fatfs_sectors_per_cluster*BLOCK_SIZE;
- size /= BLOCK_SIZE;
-
- entry = fatfs_find_file_by_name(filename);
- if(entry == NULL) {
- printf("E: File not found: %s\n", filename);
- return 0;
- }
-
- if(realsize != NULL) *realsize = le32toh(entry->file_size);
-
- n = 0;
- cluster = le16toh(entry->first_cluster);
- while(size > 0) {
- if(!fatfs_load_cluster(cluster, buffer+n*cluster_size, size))
- return 0;
- size -= fatfs_sectors_per_cluster;
- n++;
- cluster = fatfs_read_fat(cluster);
- if(cluster >= 0xFFF8) break;
- if(cluster == -1) return 0;
- }
- //putsnonl("\n");
-
- return n*cluster_size;
-}
-
-void fatfs_done(void)
-{
- bd_done();
-}

No commit comments for this range

Something went wrong with that request. Please try again.