diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-03 18:23:53 +1000 |
| commit | f26581dc7e85f77393143a44c0c3eb3eef0da8b4 (patch) | |
| tree | 9a83c5eaf1abe2cc61b216012f997e6891840a19 /drivers | |
| parent | b6daaabf32bf2092689e0732ca4486f25e80317f (diff) | |
| parent | d869d9b3b80cb9ab2314840b2fa274e89e5342db (diff) | |
| download | uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.gz uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.tar.bz2 uGFX-f26581dc7e85f77393143a44c0c3eb3eef0da8b4.zip | |
Merge branch 'master' into freertos
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gaudin/Win32/gaudin_lld.c | 2 | ||||
| -rw-r--r-- | drivers/multiple/Win32/gdisp_lld_Win32.c | 2 | ||||
| -rw-r--r-- | drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gaudin/Win32/gaudin_lld.c b/drivers/gaudin/Win32/gaudin_lld.c index 665c89f7..dce4cad3 100644 --- a/drivers/gaudin/Win32/gaudin_lld.c +++ b/drivers/gaudin/Win32/gaudin_lld.c @@ -139,7 +139,7 @@ void gaudin_lld_init(const gaudin_params *paud) { /* We need to allocate a wave header for each buffer */ nBuffers = (paud->bufcount + paud->samplesPerEvent - 1) / paud->samplesPerEvent; - if (!(pWaveHdrs = (WAVEHDR *)gfxAlloc(nBuffers * sizeof(WAVEHDR)))) { + if (!(pWaveHdrs = gfxAlloc(nBuffers * sizeof(WAVEHDR)))) { fprintf(stderr, "GAUDIN: Buffer header allocation failed\n"); return; } diff --git a/drivers/multiple/Win32/gdisp_lld_Win32.c b/drivers/multiple/Win32/gdisp_lld_Win32.c index 2910e9eb..9425bd36 100644 --- a/drivers/multiple/Win32/gdisp_lld_Win32.c +++ b/drivers/multiple/Win32/gdisp_lld_Win32.c @@ -458,7 +458,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif // Create a private area for this window - priv = (winPriv *)gfxAlloc(sizeof(winPriv)); + priv = gfxAlloc(sizeof(winPriv)); assert(priv != 0); memset(priv, 0, sizeof(winPriv)); g->priv = priv; diff --git a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c index 6f75b512..787062f6 100644 --- a/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c +++ b/drivers/multiple/uGFXnet/gdisp_lld_uGFXnet.c @@ -433,7 +433,7 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) { #endif // Create a private area for this window - if (!(priv = (netPriv *)gfxAlloc(sizeof(netPriv)))) + if (!(priv = gfxAlloc(sizeof(netPriv)))) gfxHalt("GDISP: uGFXnet - Memory allocation failed"); memset(priv, 0, sizeof(netPriv)); g->priv = priv; |