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.c     | 98 ++++++++++++++++++++++
 2 files changed, 98 insertions(+), 1 deletion(-)
 delete mode 160000 protocol/lufa/LUFA-git
 create mode 100644 protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.c

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

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.c b/protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.c
new file mode 100644
index 0000000000..8cc8cd4049
--- /dev/null
+++ b/protocol/lufa/LUFA-git/Projects/TempDataLogger/Lib/FATFs/diskio.c
@@ -0,0 +1,98 @@
+/*-----------------------------------------------------------------------*/
+/* Low level disk I/O module skeleton for FatFs     (C)ChaN, 2007        */
+/*-----------------------------------------------------------------------*/
+/* This is a stub disk I/O module that acts as front end of the existing */
+/* disk I/O modules and attach it to FatFs module with common interface. */
+/*-----------------------------------------------------------------------*/
+
+#include "diskio.h"
+
+/*-----------------------------------------------------------------------*/
+/* Initialize a Drive                                                    */
+
+DSTATUS disk_initialize (
+	BYTE drv				/* Physical drive number (0..) */
+)
+{
+	return FR_OK;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Return Disk Status                                                    */
+
+DSTATUS disk_status (
+	BYTE drv		/* Physical drive number (0..) */
+)
+{
+	return FR_OK;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Read Sector(s)                                                        */
+
+DRESULT disk_read (
+	BYTE drv,		/* Physical drive number (0..) */
+	BYTE *buff,		/* Data buffer to store read data */
+	DWORD sector,	/* Sector address (LBA) */
+	BYTE count		/* Number of sectors to read (1..128) */
+)
+{
+	DataflashManager_ReadBlocks_RAM(sector, count, buff);
+	return RES_OK;
+}
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Write Sector(s)                                                       */
+
+#if _READONLY == 0
+DRESULT disk_write (
+	BYTE drv,			/* Physical drive number (0..) */
+	const BYTE *buff,	/* Data to be written */
+	DWORD sector,		/* Sector address (LBA) */
+	BYTE count			/* Number of sectors to write (1..128) */
+)
+{
+	DataflashManager_WriteBlocks_RAM(sector, count, buff);
+	return RES_OK;
+}
+#endif /* _READONLY */
+
+
+
+/*-----------------------------------------------------------------------*/
+/* Miscellaneous Functions                                               */
+
+DRESULT disk_ioctl (
+	BYTE drv,		/* Physical drive number (0..) */
+	BYTE ctrl,		/* Control code */
+	void *buff		/* Buffer to send/receive control data */
+)
+{
+	if (ctrl == CTRL_SYNC)
+	  return RES_OK;
+	else
+	  return RES_PARERR;
+}
+
+
+DWORD get_fattime (void)
+{
+	TimeDate_t CurrTimeDate;
+
+	RTC_GetTimeDate(&CurrTimeDate);
+
+
+	return ((DWORD)(20 + CurrTimeDate.Year) << 25) |
+	             ((DWORD)CurrTimeDate.Month << 21) |
+	               ((DWORD)CurrTimeDate.Day << 16) |
+	              ((DWORD)CurrTimeDate.Hour << 11) |
+	             ((DWORD)CurrTimeDate.Minute << 5) |
+	      (((DWORD)CurrTimeDate.Second >> 1) << 0);
+}
+
-- 
cgit v1.2.3