From f6d56675f9f981c5464f0ca7a1fbb0162154e8c5 Mon Sep 17 00:00:00 2001
From: tmk <hasu@tmk-kbd.com>
Date: Wed, 13 May 2015 11:13:10 +0900
Subject: Squashed 'tmk_core/' changes from caca2c0..dc0e46e

dc0e46e Rename LUFA to LUFA-git
3bfa7fa Remove LUFA-120730
215b764 Merge commit 'afa0f22a9299686fd88f58ce09c5b521ac917e8f' as 'protocol/lufa/LUFA'
afa0f22 Squashed 'protocol/lufa/LUFA/' content from commit def7fca
c0c42fa Remove submodule of LUFA
30f897d Merge commit '87ced33feb74e79c3281dda36eb6d6d153399b41' as 'protocol/usb_hid/USB_Host_Shield_2.0'
87ced33 Squashed 'protocol/usb_hid/USB_Host_Shield_2.0/' content from commit aab4a69
14f6d49 Remove submodule of USB_Host_Shield_2.0

git-subtree-dir: tmk_core
git-subtree-split: dc0e46eaa4367d4e218f8816e3c117895820f07c
---
 protocol/lufa/LUFA-git                             |  1 -
 .../Projects/TempDataLogger/Lib/FATFs/diskio.h     | 55 ++++++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 delete mode 160000 protocol/lufa/LUFA-git
 create mode 100644 protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.h

(limited to 'protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.h')

diff --git a/protocol/lufa/LUFA-git b/protocol/lufa/LUFA-git
deleted file mode 160000
index b6c18b2a7c..0000000000
--- a/protocol/lufa/LUFA-git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b6c18b2a7c544653efbe12a1d4e8ba65e7d83c35
diff --git a/protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.h b/protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.h
new file mode 100644
index 0000000000..d3c3149a59
--- /dev/null
+++ b/protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.h
@@ -0,0 +1,55 @@
+/*-----------------------------------------------------------------------
+/  Low level disk interface module include file
+/-----------------------------------------------------------------------*/
+
+#ifndef _DISKIO_DEFINED
+#define _DISKIO_DEFINED
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "integer.h"
+
+#include "../DataflashManager.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*);
+
+
+/* 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 */
+
+/* Generic command */
+#define CTRL_SYNC			0	/* Mandatory for write functions */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
-- 
cgit v1.2.3