X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=lib%2Fgunzip.c;h=832b3064e7614bc7c74159ca04f62b3122420356;hb=a5b9f8c8f07f2a901354a77c6131cb0429881bf8;hp=da0c76c500d1cf2db8362ebc753defb61f1474ea;hpb=595af9db2422fa5ae734cfe615415b17a5098f34;p=u-boot diff --git a/lib/gunzip.c b/lib/gunzip.c index da0c76c500..832b3064e7 100644 --- a/lib/gunzip.c +++ b/lib/gunzip.c @@ -11,6 +11,7 @@ #include #include #include +#include #include #include @@ -105,7 +106,7 @@ void gzwrite_progress_finish(int returnval, } int gzwrite(unsigned char *src, int len, - struct block_dev_desc *dev, + struct blk_desc *dev, unsigned long szwritebuf, u64 startoffs, u64 szexpected) @@ -193,7 +194,7 @@ int gzwrite(unsigned char *src, int len, s.next_in = src + i; s.avail_in = payload_size+8; - writebuf = (unsigned char *)malloc(szwritebuf); + writebuf = (unsigned char *)malloc_cache_aligned(szwritebuf); /* decompress until deflate stream ends or end of file */ do { @@ -232,9 +233,8 @@ int gzwrite(unsigned char *src, int len, gzwrite_progress(iteration++, totalfilled, szexpected); - blocks_written = dev->block_write(dev, outblock, - writeblocks, - writebuf); + blocks_written = blk_dwrite(dev, outblock, + writeblocks, writebuf); outblock += blocks_written; if (ctrlc()) { puts("abort\n");