Merge branch 'master' into developer

Conflicts:
	Makefile
	source/firm.c
	source/patches.c
	source/patches.h
This commit is contained in:
TuxSH
2016-05-25 22:28:50 +02:00
15 changed files with 302 additions and 284 deletions

View File

@@ -9,6 +9,7 @@
#include "diskio.h" /* FatFs lower layer API */
#include "sdmmc/sdmmc.h"
#include "../crypto.h"
/* Definitions of physical drive number for each media */
#define SDCARD 0

View File

@@ -1,5 +1,4 @@
#pragma once
#include <stdbool.h>
#include "../../types.h"
#include "../../crypto.h"
#include "../../types.h"