diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-11-03 10:51:23 +1000 |
| commit | 7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d (patch) | |
| tree | 95cf152ef65ff19c7b2515b427bbe86b92b611d0 /demos/modules/gaudio/oscilloscope | |
| parent | 8bd70d953bcd3e32ceb4e45a4e561c973726280a (diff) | |
| download | uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.gz uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.tar.bz2 uGFX-7c5a6c928fa7129cf754c9c73c5c7ae39372ba9d.zip | |
For all source files update integer types to the new gI8 etc type names
Diffstat (limited to 'demos/modules/gaudio/oscilloscope')
| -rw-r--r-- | demos/modules/gaudio/oscilloscope/gwinosc.c | 12 | ||||
| -rw-r--r-- | demos/modules/gaudio/oscilloscope/gwinosc.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.c b/demos/modules/gaudio/oscilloscope/gwinosc.c index e46640e8..001dbc68 100644 --- a/demos/modules/gaudio/oscilloscope/gwinosc.c +++ b/demos/modules/gaudio/oscilloscope/gwinosc.c @@ -64,7 +64,7 @@ static const gwinVMT scopeVMT = { 0, // The after-clear routine }; -GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format) { +GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format) { /* Make sure the audio parameters are valid first */ if (!gaudioRecordInit(channel, frequency, format)) return 0; @@ -100,10 +100,10 @@ void gwinScopeWaitForTrace(GHandle gh) { int i; gCoord x, y; gCoord yoffset; - uint8_t *pa8; - uint16_t *pa16; + gU8 *pa8; + gU16 *pa16; gCoord *pc; - uint8_t shr; + gU8 shr; #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP gBool rdytrigger; @@ -132,8 +132,8 @@ void gwinScopeWaitForTrace(GHandle gh) { x = gs->nextx; pc = gs->lastscopetrace+x; - pa8 = (uint8_t *)(paud+1); - pa16 = (uint16_t *)(paud+1); + pa8 = (gU8 *)(paud+1); + pa16 = (gU16 *)(paud+1); #if TRIGGER_METHOD == TRIGGER_POSITIVERAMP rdytrigger = gFalse; diff --git a/demos/modules/gaudio/oscilloscope/gwinosc.h b/demos/modules/gaudio/oscilloscope/gwinosc.h index e77a61b2..99e81dad 100644 --- a/demos/modules/gaudio/oscilloscope/gwinosc.h +++ b/demos/modules/gaudio/oscilloscope/gwinosc.h @@ -81,7 +81,7 @@ extern "C" { /** * Create a scope window. */ - GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, uint16_t channel, uint32_t frequency, ArrayDataFormat format); + GHandle gwinGScopeCreate(GDisplay *g, GScopeObject *gs, GWindowInit *pInit, gU16 channel, gU32 frequency, ArrayDataFormat format); #define gwinScopeCreate(gs,pI,ch,f,fmt) gwinGScopeCreate(GDISP,gs,pI,ch,f,fmt) /** |