lib: debug: add printf functionality with nanoprintf
Add the respectively required definitions in unic.
This commit is contained in:
1 parent
0008ecfa60
commit
280972aec2
7 files changed
+1322
-6
No files matched your search
+1
-1
@@ -16,5 +16,5 @@
|
||||
#define KERN_INFO 6
|
||||
#define KERN_DEBUG 7
|
||||
|
||||
extern void printk(int loglevel, char *text);
|
||||
extern void printk(int log_level, const char *fmt, ...);
|
||||
#endif // DEBUG_H_
|
||||
File diff suppressed because it is too large.
Load diff
+27
-5
@@ -5,10 +5,25 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <stdarg.h>
|
||||
#include <lib/debug.h>
|
||||
#include <lib/simplefb.h>
|
||||
#include <lib/video/font.h>
|
||||
|
||||
#define NANOPRINTF_IMPLEMENTATION
|
||||
#define NANOPRINTF_USE_FIELD_WIDTH_FORMAT_SPECIFIERS 1
|
||||
#define NANOPRINTF_USE_PRECISION_FORMAT_SPECIFIERS 1
|
||||
#define NANOPRINTF_USE_FLOAT_FORMAT_SPECIFIERS 0
|
||||
#define NANOPRINTF_USE_SMALL_FORMAT_SPECIFIERS 1
|
||||
#define NANOPRINTF_USE_LARGE_FORMAT_SPECIFIERS 0
|
||||
#define NANOPRINTF_USE_BINARY_FORMAT_SPECIFIERS 1
|
||||
#define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 1
|
||||
#define NANOPRINTF_USE_ALT_FORM_FLAG 1
|
||||
|
||||
#include <lib/nanoprintf.h>
|
||||
|
||||
#define PRINTK_BUFFER_SIZE 256
|
||||
|
||||
long int debug_linecount = 0;
|
||||
|
||||
void uart_puts(const char *s);
|
||||
@@ -16,8 +31,11 @@ void uart_puts(const char *s);
|
||||
// Global log level that controls the verbosity
|
||||
static int global_loglevel = CONFIG_LOGLEVEL;
|
||||
|
||||
void printk(int log_level, char *text)
|
||||
void printk(int log_level, const char *fmt, ...)
|
||||
{
|
||||
static char print_buffer[PRINTK_BUFFER_SIZE];
|
||||
va_list args;
|
||||
|
||||
if (log_level > global_loglevel)
|
||||
return;
|
||||
|
||||
@@ -52,9 +70,13 @@ void printk(int log_level, char *text)
|
||||
break;
|
||||
}
|
||||
|
||||
va_start(args, fmt);
|
||||
npf_vsnprintf(print_buffer, sizeof(print_buffer), fmt, args);
|
||||
va_end(args);
|
||||
|
||||
#ifdef CONFIG_UART_DEBUG
|
||||
uart_puts(prefix);
|
||||
uart_puts(text);
|
||||
uart_puts(print_buffer);
|
||||
uart_puts("\r");
|
||||
#endif
|
||||
|
||||
@@ -64,8 +86,8 @@ void printk(int log_level, char *text)
|
||||
int prefix_width = strlen(prefix) * SCALED_FONTW;
|
||||
|
||||
__simplefb_raw_print((char*)CONFIG_FRAMEBUFFER_BASE, prefix, 0, y_pos,
|
||||
CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_STRIDE);
|
||||
__simplefb_raw_print((char*)CONFIG_FRAMEBUFFER_BASE, text, prefix_width, y_pos,
|
||||
CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_STRIDE);
|
||||
CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_STRIDE);
|
||||
__simplefb_raw_print((char*)CONFIG_FRAMEBUFFER_BASE, print_buffer, prefix_width, y_pos,
|
||||
CONFIG_FRAMEBUFFER_WIDTH, CONFIG_FRAMEBUFFER_STRIDE);
|
||||
#endif
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
#ifndef _FLOAT_H
|
||||
#define _FLOAT_H
|
||||
|
||||
#define FLT_MAX 3.402823466e+38F
|
||||
#define DBL_MAX 1.7976931348623158e+308
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,48 @@
|
||||
/* SPDX-License-Identifier: MIT */
|
||||
/*
|
||||
* Copyright (c) 2025, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
|
||||
*/
|
||||
|
||||
#ifndef _LIMITS_H /* Include guard */
|
||||
#define _LIMITS_H
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
typedef uintptr_t phys_addr_t;
|
||||
typedef uintptr_t resource_size_t;
|
||||
|
||||
#define SIZE_MAX (~(size_t)0)
|
||||
#define SSIZE_MAX ((ssize_t)(SIZE_MAX >> 1))
|
||||
#define PHYS_ADDR_MAX (~(phys_addr_t)0)
|
||||
|
||||
#define RESOURCE_SIZE_MAX ((resource_size_t)~0)
|
||||
|
||||
#define U8_MAX ((uint8_t)~0U)
|
||||
#define S8_MAX ((int8_t)(U8_MAX >> 1))
|
||||
#define S8_MIN ((int8_t)(-S8_MAX - 1))
|
||||
|
||||
#define U16_MAX ((uint16_t)~0U)
|
||||
#define S16_MAX ((int16_t)(U16_MAX >> 1))
|
||||
#define S16_MIN ((int16_t)(-S16_MAX - 1))
|
||||
|
||||
#define U32_MAX ((uint32_t)~0U)
|
||||
#define U32_MIN ((uint32_t)0)
|
||||
#define S32_MAX ((int32_t)(U32_MAX >> 1))
|
||||
#define S32_MIN ((int32_t)(-S32_MAX - 1))
|
||||
|
||||
#define U64_MAX ((uint64_t)~0ULL)
|
||||
#define S64_MAX ((int64_t)(U64_MAX >> 1))
|
||||
#define S64_MIN ((int64_t)(-S64_MAX - 1))
|
||||
|
||||
typedef signed long long intmax_t;
|
||||
typedef unsigned long long uintmax_t;
|
||||
|
||||
typedef signed long ptrdiff_t;
|
||||
typedef unsigned long size_t;
|
||||
typedef signed long ssize_t;
|
||||
|
||||
typedef char int_fast8_t;
|
||||
typedef unsigned char uint_fast8_t;
|
||||
|
||||
#endif /* _LIMITS_H */
|
||||
@@ -0,0 +1,16 @@
|
||||
/* SPDX-License-Identifier: MIT */
|
||||
/* SPDX-License-Identifier: MIT */
|
||||
/*
|
||||
* Copyright (c) 2024, Ivaylo Ivanov <ivo.ivanov.ivanov1@gmail.com>
|
||||
*/
|
||||
#ifndef _STDARG_H
|
||||
#define _STDARG_H
|
||||
|
||||
typedef __builtin_va_list va_list;
|
||||
|
||||
#define va_start(ap, last) __builtin_va_start(ap, last)
|
||||
#define va_arg(ap, type) __builtin_va_arg(ap, type)
|
||||
#define va_end(ap) __builtin_va_end(ap)
|
||||
#define va_copy(dest, src) __builtin_va_copy(dest, src)
|
||||
|
||||
#endif /* _STDARG_H */
|
||||
@@ -13,6 +13,12 @@ typedef unsigned char uint8_t;
|
||||
typedef unsigned short uint16_t;
|
||||
typedef unsigned int uint32_t;
|
||||
|
||||
#if __SIZEOF_POINTER__ == 8
|
||||
typedef unsigned long uintptr_t;
|
||||
#else
|
||||
typedef unsigned int uintptr_t;
|
||||
#endif
|
||||
|
||||
#ifdef __x86_64__
|
||||
typedef unsigned long uint64_t;
|
||||
typedef long int64_t;
|
||||
@@ -21,4 +27,6 @@ typedef unsigned long long uint64_t;
|
||||
typedef long long int64_t;
|
||||
#endif
|
||||
|
||||
#define CHAR_BIT 8
|
||||
|
||||
#endif // INTTYPES_H
|
||||
Reference in new issue
Block a user