aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Hannam <andrewh@inmarket.com.au>2013-03-07 06:18:45 -0800
committerAndrew Hannam <andrewh@inmarket.com.au>2013-03-07 06:18:45 -0800
commit828959d89a641a9f633cc20e4488ec021eb9808c (patch)
treeceee3ce1b7a8c3313c4cafbc708782628cf3c4b5 /src
parent8aaf96d379df2f70abf96b03c863b6e6d12a09bf (diff)
parente315480c713cb6889c8329788d3dd69c9fbc6cf4 (diff)
downloaduGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.gz
uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.tar.bz2
uGFX-828959d89a641a9f633cc20e4488ec021eb9808c.zip
Merge pull request #19 from Tectu/master
Merge Textu Changes
Diffstat (limited to 'src')
-rw-r--r--src/gadc/gadc.c8
-rw-r--r--src/gaudin/gaudin.c2
-rw-r--r--src/gaudout/gaudout.c2
-rw-r--r--src/gdisp/fonts.c2
-rw-r--r--src/gdisp/gdisp.c2
-rw-r--r--src/gevent/gevent.c2
-rw-r--r--src/ginput/dial.c2
-rw-r--r--src/ginput/keyboard.c2
-rw-r--r--src/ginput/mouse.c10
-rw-r--r--src/ginput/toggle.c2
-rw-r--r--src/gmisc/arrayops.c2
-rw-r--r--src/gtimer/gtimer.c2
-rw-r--r--src/gwin/button.c2
-rw-r--r--src/gwin/console.c2
-rw-r--r--src/gwin/graph.c2
-rw-r--r--src/gwin/gwin.c2
-rw-r--r--src/tdisp/tdisp.c2
17 files changed, 24 insertions, 24 deletions
diff --git a/src/gadc/gadc.c b/src/gadc/gadc.c
index 8a3cfb8d..183b9923 100644
--- a/src/gadc/gadc.c
+++ b/src/gadc/gadc.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012, 2013
+ ChibiOS/GFX - Copyright (C) 2012, 2013, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -99,7 +99,7 @@ static struct lsdev {
static struct lsdev *curlsdev;
/* Find the next conversion to activate */
-static __inline void FindNextConversionI(void) {
+static inline void FindNextConversionI(void) {
if (curlsdev) {
/**
* Now we have done a low speed conversion - start looking for the next conversion
@@ -251,14 +251,14 @@ void GADC_ISR_ErrorI(ADCDriver *adcp, adcerror_t err) {
FindNextConversionI();
}
-static __inline void DoInit(void) {
+static inline void DoInit(void) {
if (!(gflags & GADC_GFLG_INITDONE)) {
gflags |= GADC_GFLG_INITDONE;
gadc_lld_init();
}
}
-static __inline void StartADC(bool_t onNoHS) {
+static inline void StartADC(bool_t onNoHS) {
chSysLock();
if (!(gflags & GADC_GFLG_ISACTIVE) || (onNoHS && !curlsdev))
FindNextConversionI();
diff --git a/src/gaudin/gaudin.c b/src/gaudin/gaudin.c
index 4ce04132..2fbe7a47 100644
--- a/src/gaudin/gaudin.c
+++ b/src/gaudin/gaudin.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gaudout/gaudout.c b/src/gaudout/gaudout.c
index af8499dc..5c2e0657 100644
--- a/src/gaudout/gaudout.c
+++ b/src/gaudout/gaudout.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gdisp/fonts.c b/src/gdisp/fonts.c
index 59293359..d69d6de0 100644
--- a/src/gdisp/fonts.c
+++ b/src/gdisp/fonts.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c
index 620b3c0b..8cccad29 100644
--- a/src/gdisp/gdisp.c
+++ b/src/gdisp/gdisp.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gevent/gevent.c b/src/gevent/gevent.c
index f6d45f1a..b93f1ea8 100644
--- a/src/gevent/gevent.c
+++ b/src/gevent/gevent.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/ginput/dial.c b/src/ginput/dial.c
index a447d8bc..60bc9ae8 100644
--- a/src/ginput/dial.c
+++ b/src/ginput/dial.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/ginput/keyboard.c b/src/ginput/keyboard.c
index 56ff5e8a..145b66f1 100644
--- a/src/ginput/keyboard.c
+++ b/src/ginput/keyboard.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c
index 94734888..4ad32359 100644
--- a/src/ginput/mouse.c
+++ b/src/ginput/mouse.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
@@ -88,7 +88,7 @@ static struct MouseConfig_t {
} MouseConfig;
#if GINPUT_MOUSE_NEED_CALIBRATION
- static __inline void _tsDrawCross(const MousePoint *pp) {
+ static inline void _tsDrawCross(const MousePoint *pp) {
gdispDrawLine(pp->x-15, pp->y, pp->x-2, pp->y, White);
gdispDrawLine(pp->x+2, pp->y, pp->x+15, pp->y, White);
gdispDrawLine(pp->x, pp->y-15, pp->x, pp->y-2, White);
@@ -107,16 +107,16 @@ static struct MouseConfig_t {
gdispDrawLine(pp->x+15, pp->y-15, pp->x+15, pp->y-7, RGB2COLOR(184,158,131));
}
- static __inline void _tsClearCross(const MousePoint *pp) {
+ static inline void _tsClearCross(const MousePoint *pp) {
gdispFillArea(pp->x - 15, pp->y - 15, 42, 42, Blue);
}
- static __inline void _tsTransform(MouseReading *pt, const Calibration *c) {
+ static inline void _tsTransform(MouseReading *pt, const Calibration *c) {
pt->x = (coord_t) (c->ax * pt->x + c->bx * pt->y + c->cx);
pt->y = (coord_t) (c->ay * pt->x + c->by * pt->y + c->cy);
}
- static __inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
+ static inline void _tsDo3PointCalibration(const MousePoint *cross, const MousePoint *points, Calibration *c) {
float dx, dx0, dx1, dx2, dy0, dy1, dy2;
/* Compute all the required determinants */
diff --git a/src/ginput/toggle.c b/src/ginput/toggle.c
index 4401e295..5761279b 100644
--- a/src/ginput/toggle.c
+++ b/src/ginput/toggle.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gmisc/arrayops.c b/src/gmisc/arrayops.c
index 6eeb0e75..8b2135a0 100644
--- a/src/gmisc/arrayops.c
+++ b/src/gmisc/arrayops.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gtimer/gtimer.c b/src/gtimer/gtimer.c
index 76dd57e2..e1f6bb8f 100644
--- a/src/gtimer/gtimer.c
+++ b/src/gtimer/gtimer.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gwin/button.c b/src/gwin/button.c
index a558dec0..43bc80c6 100644
--- a/src/gwin/button.c
+++ b/src/gwin/button.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gwin/console.c b/src/gwin/console.c
index 9be7ee34..6720e6b3 100644
--- a/src/gwin/console.c
+++ b/src/gwin/console.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gwin/graph.c b/src/gwin/graph.c
index a9d20c4b..89876584 100644
--- a/src/gwin/graph.c
+++ b/src/gwin/graph.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c
index e449b830..33637d89 100644
--- a/src/gwin/gwin.c
+++ b/src/gwin/gwin.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
diff --git a/src/tdisp/tdisp.c b/src/tdisp/tdisp.c
index 8ef7e5c4..dab05cda 100644
--- a/src/tdisp/tdisp.c
+++ b/src/tdisp/tdisp.c
@@ -1,5 +1,5 @@
/*
- ChibiOS/GFX - Copyright (C) 2012
+ ChibiOS/GFX - Copyright (C) 2012, 2013
Joel Bodenmann aka Tectu <joel@unormal.org>
This file is part of ChibiOS/GFX.
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-06 16:28:40 +0000