From e9f60dae385f1c7b58d1ae26a00d051da40f65d3 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sun, 2 Jun 2013 18:58:12 +1000
Subject: Fix license issues and GOS issues in TDISP

---
 src/tdisp/tdisp.c | 45 +++++++++++++--------------------------------
 1 file changed, 13 insertions(+), 32 deletions(-)

(limited to 'src')

diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c
index d51bfd94..17451deb 100644
--- a/src/tdisp/tdisp.c
+++ b/src/tdisp/tdisp.c
@@ -1,22 +1,9 @@
 /*
-    ChibiOS/GFX - Copyright (C) 2012, 2013
-                 Joel Bodenmann aka Tectu <joel@unormal.org>
-
-    This file is part of ChibiOS/GFX.
-
-    ChibiOS/GFX 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; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/GFX 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/>.
-*/
+ * This file is subject to the terms of the GFX License, v1.0. If a copy of
+ * the license was not distributed with this file, you can obtain one at:
+ *
+ *              http://chibios-gfx.com/license.html
+ */
 
 /**
  * @file    src/tdisp/tdisp.c
@@ -25,29 +12,23 @@
  * @addtogroup TDISP
  * @{
  */
-#include "ch.h"
-#include "hal.h"
 #include "gfx.h"
 
 #if GFX_USE_TDISP || defined(__DOXYGEN__)
 
-#include "../../include/tdisp/lld/tdisp_lld.h"
+#include "tdisp/lld/tdisp_lld.h"
 
 /* cursor controllers */
-#define CURSOR		1
-#define ON		0
-#define OFF
+#define TDISP_CURSOR		1
+#define TDISP_CURSOR_ON		0
+#define TDISP_CURSOR_OFF
 
 #if TDISP_NEED_MULTITHREAD
-	#if !CH_USE_MUTEXES
-		#error "TDISP: CH_USE_MUTEXES must be defined in chconf.h because TDISP_NEED_MULTITHREAD is defined"
-	#endif
-
-	static Mutex			tdispMutex;
+	static gfxMutex			tdispMutex;
 
-	#define MUTEX_INIT()	chMtxInit(&tdispMutex)
-	#define MUTEX_ENTER()	chMtxLock(&tdispMutex)
-	#define MUTEX_LEAVE()	chMtxUnlock()
+	#define MUTEX_INIT()	gfxMutexInit(&tdispMutex)
+	#define MUTEX_ENTER()	gfxMutexEnter(&tdispMutex)
+	#define MUTEX_LEAVE()	gfxMutexExit(&tdispMutex)
 
 #else
 
-- 
cgit v1.2.3