summaryrefslogtreecommitdiff
path: root/lib/fatfs/diskio.c
diff options
context:
space:
mode:
authorScott Shawcroft <scott.shawcroft@gmail.com>2017-06-20 10:56:05 -0700
committerScott Shawcroft <scott.shawcroft@gmail.com>2017-06-20 10:56:05 -0700
commit30ee7019ca651bce1fe966c1089fe977d51dc92b (patch)
tree0114b6f744dd175b7722dd8edcbe24f4ee84bb45 /lib/fatfs/diskio.c
parent97fcdfbd08c922efd7470d6482d7c7c703ffc0ae (diff)
parent869cdcfdfc860b1177baf9b0f8818915ba54f3f5 (diff)
Merge tag 'v1.9.1'2.0.0-alpha.0
Fixes for stmhal USB mass storage, lwIP bindings and VFS regressions This release provides an important fix for the USB mass storage device in the stmhal port by implementing the SCSI SYNCHRONIZE_CACHE command, which is now require by some Operating Systems. There are also fixes for the lwIP bindings to improve non-blocking sockets and error codes. The VFS has some regressions fixed including the ability to statvfs the root. All changes are listed below. py core: - modbuiltins: add core-provided version of input() function - objstr: catch case of negative "maxsplit" arg to str.rsplit() - persistentcode: allow to compile with complex numbers disabled - objstr: allow to compile with obj-repr D, and unicode disabled - modsys: allow to compile with obj-repr D and PY_ATTRTUPLE disabled - provide mp_decode_uint_skip() to help reduce stack usage - makeqstrdefs.py: make script run correctly with Python 2.6 - objstringio: if created from immutable object, follow copy on write policy extmod: - modlwip: connect: for non-blocking mode, return EINPROGRESS - modlwip: fix error codes for duplicate calls to connect() - modlwip: accept: fix error code for non-blocking mode - vfs: allow to statvfs the root directory - vfs: allow "buffering" and "encoding" args to VFS's open() - modframebuf: fix signed/unsigned comparison pendantic warning lib: - libm: use isfinite instead of finitef, for C99 compatibility - utils/interrupt_char: remove support for KBD_EXCEPTION disabled tests: - basics/string_rsplit: add tests for negative "maxsplit" argument - float: convert "sys.exit()" to "raise SystemExit" - float/builtin_float_minmax: PEP8 fixes - basics: convert "sys.exit()" to "raise SystemExit" - convert remaining "sys.exit()" to "raise SystemExit" unix port: - convert to use core-provided version of built-in import() - Makefile: replace references to make with $(MAKE) windows port: - convert to use core-provided version of built-in import() qemu-arm port: - Makefile: adjust object-file lists to get correct dependencies - enable micropython.mem_*() functions to allow more tests stmhal port: - boards: enable DAC for NUCLEO_F767ZI board - add support for NUCLEO_F446RE board - pass USB handler as parameter to allow more than one USB handler - usb: use local USB handler variable in Start-of-Frame handler - usb: make state for USB device private to top-level USB driver - usbdev: for MSC implement SCSI SYNCHRONIZE_CACHE command - convert from using stmhal's input() to core provided version cc3200 port: - convert from using stmhal's input() to core provided version teensy port: - convert from using stmhal's input() to core provided version esp8266 port: - Makefile: replace references to make with $(MAKE) - Makefile: add clean-modules target - convert from using stmhal's input() to core provided version zephyr port: - modusocket: getaddrinfo: Fix mp_obj_len() usage - define MICROPY_PY_SYS_PLATFORM (to "zephyr") - machine_pin: use native Zephyr types for Zephyr API calls docs: - machine.Pin: remove out_value() method - machine.Pin: add on() and off() methods - esp8266: consistently replace Pin.high/low methods with .on/off - esp8266/quickref: polish Pin.on()/off() examples - network: move confusingly-named cc3200 Server class to its reference - uos: deconditionalize, remove minor port-specific details - uos: move cc3200 port legacy VFS mounting functions to its ref doc - machine: sort machine classes in logical order, not alphabetically - network: first step to describe standard network class interface examples: - embedding: use core-provided KeyboardInterrupt object
Diffstat (limited to 'lib/fatfs/diskio.c')
-rw-r--r--lib/fatfs/diskio.c230
1 files changed, 0 insertions, 230 deletions
diff --git a/lib/fatfs/diskio.c b/lib/fatfs/diskio.c
deleted file mode 100644
index 82200ad0f..000000000
--- a/lib/fatfs/diskio.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/*-----------------------------------------------------------------------*/
-/* Low level disk I/O module skeleton for FatFs (C)ChaN, 2014 */
-/*-----------------------------------------------------------------------*/
-/* If a working storage control module is available, it should be */
-/* attached to the FatFs via a glue function rather than modifying it. */
-/* This is an example of glue functions to attach various exsisting */
-/* storage control modules to the FatFs module with a defined API. */
-/*-----------------------------------------------------------------------*/
-
-#include "diskio.h" /* FatFs lower layer API */
-#include "usbdisk.h" /* Example: Header file of existing USB MSD control module */
-#include "atadrive.h" /* Example: Header file of existing ATA harddisk control module */
-#include "sdcard.h" /* Example: Header file of existing MMC/SDC contorl module */
-
-/* Definitions of physical drive number for each drive */
-#define ATA 0 /* Example: Map ATA harddisk to physical drive 0 */
-#define MMC 1 /* Example: Map MMC/SD card to physical drive 1 */
-#define USB 2 /* Example: Map USB MSD to physical drive 2 */
-
-
-/*-----------------------------------------------------------------------*/
-/* Get Drive Status */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_status (
- BYTE pdrv /* Physical drive nmuber to identify the drive */
-)
-{
- DSTATUS stat;
- int result;
-
- switch (pdrv) {
- case ATA :
- result = ATA_disk_status();
-
- // translate the reslut code here
-
- return stat;
-
- case MMC :
- result = MMC_disk_status();
-
- // translate the reslut code here
-
- return stat;
-
- case USB :
- result = USB_disk_status();
-
- // translate the reslut code here
-
- return stat;
- }
- return STA_NOINIT;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Inidialize a Drive */
-/*-----------------------------------------------------------------------*/
-
-DSTATUS disk_initialize (
- BYTE pdrv /* Physical drive nmuber to identify the drive */
-)
-{
- DSTATUS stat;
- int result;
-
- switch (pdrv) {
- case ATA :
- result = ATA_disk_initialize();
-
- // translate the reslut code here
-
- return stat;
-
- case MMC :
- result = MMC_disk_initialize();
-
- // translate the reslut code here
-
- return stat;
-
- case USB :
- result = USB_disk_initialize();
-
- // translate the reslut code here
-
- return stat;
- }
- return STA_NOINIT;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Read Sector(s) */
-/*-----------------------------------------------------------------------*/
-
-DRESULT disk_read (
- BYTE pdrv, /* Physical drive nmuber to identify the drive */
- BYTE *buff, /* Data buffer to store read data */
- DWORD sector, /* Sector address in LBA */
- UINT count /* Number of sectors to read */
-)
-{
- DRESULT res;
- int result;
-
- switch (pdrv) {
- case ATA :
- // translate the arguments here
-
- result = ATA_disk_read(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
-
- case MMC :
- // translate the arguments here
-
- result = MMC_disk_read(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
-
- case USB :
- // translate the arguments here
-
- result = USB_disk_read(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
- }
-
- return RES_PARERR;
-}
-
-
-
-/*-----------------------------------------------------------------------*/
-/* Write Sector(s) */
-/*-----------------------------------------------------------------------*/
-
-#if _USE_WRITE
-DRESULT disk_write (
- BYTE pdrv, /* Physical drive nmuber to identify the drive */
- const BYTE *buff, /* Data to be written */
- DWORD sector, /* Sector address in LBA */
- UINT count /* Number of sectors to write */
-)
-{
- DRESULT res;
- int result;
-
- switch (pdrv) {
- case ATA :
- // translate the arguments here
-
- result = ATA_disk_write(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
-
- case MMC :
- // translate the arguments here
-
- result = MMC_disk_write(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
-
- case USB :
- // translate the arguments here
-
- result = USB_disk_write(buff, sector, count);
-
- // translate the reslut code here
-
- return res;
- }
-
- return RES_PARERR;
-}
-#endif
-
-
-/*-----------------------------------------------------------------------*/
-/* Miscellaneous Functions */
-/*-----------------------------------------------------------------------*/
-
-#if _USE_IOCTL
-DRESULT disk_ioctl (
- BYTE pdrv, /* Physical drive nmuber (0..) */
- BYTE cmd, /* Control code */
- void *buff /* Buffer to send/receive control data */
-)
-{
- DRESULT res;
- int result;
-
- switch (pdrv) {
- case ATA :
-
- // Process of the command for the ATA drive
-
- return res;
-
- case MMC :
-
- // Process of the command for the MMC/SD card
-
- return res;
-
- case USB :
-
- // Process of the command the USB drive
-
- return res;
- }
-
- return RES_PARERR;
-}
-#endif