lib: avb: change the output memssage I/O
Since the stderr is not used in uboot, use printf to print the message. Change-Id: Ib522609e783acf8f407e2f9fb3805b553c543cba Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
This commit is contained in:
Jason Zhu
Jianhong Chen
parent
2291ec7c6f
commit
4454e90b43
|
|
@ -1,90 +1,90 @@
|
|||
/*
|
||||
* Copyright (C) 2016 The Android Open Source Project
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person
|
||||
* obtaining a copy of this software and associated documentation
|
||||
* files (the "Software"), to deal in the Software without
|
||||
* restriction, including without limitation the rights to use, copy,
|
||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
* of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <common.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
#include <errno.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <android_avb/avb_sysdeps.h>
|
||||
|
||||
void abort(void)
|
||||
{
|
||||
|
||||
}
|
||||
int avb_memcmp(const void* src1, const void* src2, size_t n) {
|
||||
return memcmp(src1, src2, n);
|
||||
}
|
||||
|
||||
void* avb_memcpy(void* dest, const void* src, size_t n) {
|
||||
return memcpy(dest, src, n);
|
||||
}
|
||||
|
||||
void* avb_memset(void* dest, const int c, size_t n) {
|
||||
return memset(dest, c, n);
|
||||
}
|
||||
|
||||
int avb_strcmp(const char* s1, const char* s2) {
|
||||
return strcmp(s1, s2);
|
||||
}
|
||||
|
||||
size_t avb_strlen(const char* str) {
|
||||
return strlen(str);
|
||||
}
|
||||
|
||||
void avb_abort(void) {
|
||||
abort();
|
||||
}
|
||||
|
||||
void avb_print(const char* message) {
|
||||
fprintf(stderr, "%s", message);
|
||||
}
|
||||
|
||||
void avb_printv(const char* message, ...) {
|
||||
va_list ap;
|
||||
const char* m;
|
||||
|
||||
va_start(ap, message);
|
||||
for (m = message; m != NULL; m = va_arg(ap, const char*)) {
|
||||
fprintf(stderr, "%s", m);
|
||||
}
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void* avb_malloc_(size_t size) {
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
void avb_free(void* ptr) {
|
||||
free(ptr);
|
||||
}
|
||||
|
||||
uint32_t avb_div_by_10(uint64_t* dividend) {
|
||||
uint32_t rem = (uint32_t)(*dividend % 10);
|
||||
*dividend /= 10;
|
||||
return rem;
|
||||
}
|
||||
/*
|
||||
* Copyright (C) 2016 The Android Open Source Project
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person
|
||||
* obtaining a copy of this software and associated documentation
|
||||
* files (the "Software"), to deal in the Software without
|
||||
* restriction, including without limitation the rights to use, copy,
|
||||
* modify, merge, publish, distribute, sublicense, and/or sell copies
|
||||
* of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
* SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
#include <common.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <malloc.h>
|
||||
#include <errno.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#include <android_avb/avb_sysdeps.h>
|
||||
|
||||
void abort(void)
|
||||
{
|
||||
|
||||
}
|
||||
int avb_memcmp(const void* src1, const void* src2, size_t n) {
|
||||
return memcmp(src1, src2, n);
|
||||
}
|
||||
|
||||
void* avb_memcpy(void* dest, const void* src, size_t n) {
|
||||
return memcpy(dest, src, n);
|
||||
}
|
||||
|
||||
void* avb_memset(void* dest, const int c, size_t n) {
|
||||
return memset(dest, c, n);
|
||||
}
|
||||
|
||||
int avb_strcmp(const char* s1, const char* s2) {
|
||||
return strcmp(s1, s2);
|
||||
}
|
||||
|
||||
size_t avb_strlen(const char* str) {
|
||||
return strlen(str);
|
||||
}
|
||||
|
||||
void avb_abort(void) {
|
||||
abort();
|
||||
}
|
||||
|
||||
void avb_print(const char* message) {
|
||||
printf("%s", message);
|
||||
}
|
||||
|
||||
void avb_printv(const char* message, ...) {
|
||||
va_list ap;
|
||||
const char* m;
|
||||
|
||||
va_start(ap, message);
|
||||
for (m = message; m != NULL; m = va_arg(ap, const char*)) {
|
||||
printf("%s", m);
|
||||
}
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
void* avb_malloc_(size_t size) {
|
||||
return malloc(size);
|
||||
}
|
||||
|
||||
void avb_free(void* ptr) {
|
||||
free(ptr);
|
||||
}
|
||||
|
||||
uint32_t avb_div_by_10(uint64_t* dividend) {
|
||||
uint32_t rem = (uint32_t)(*dividend % 10);
|
||||
*dividend /= 10;
|
||||
return rem;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue