diff --git a/apps/ls.c b/apps/ls.c index 55608c20..4ee6040e 100644 --- a/apps/ls.c +++ b/apps/ls.c @@ -487,8 +487,3 @@ int main (int argc, char * argv[]) { return out; } -/* - * vim: tabstop=4 - * vim: shiftwidth=4 - * vim: noexpandtab - */ diff --git a/apps/ps.c b/apps/ps.c index f1ac2d38..d9e89f2e 100644 --- a/apps/ps.c +++ b/apps/ps.c @@ -317,8 +317,3 @@ int main (int argc, char * argv[]) { return 0; } -/* - * vim: tabstop=4 - * vim: shiftwidth=4 - * vim: noexpandtab - */ diff --git a/apps/pstree.c b/apps/pstree.c index 108cb6a3..e6511faf 100644 --- a/apps/pstree.c +++ b/apps/pstree.c @@ -177,9 +177,3 @@ int main (int argc, char * argv[]) { return 0; } -/* - * vim: tabstop=4 - * vim: shiftwidth=4 - * vim: noexpandtab - */ - diff --git a/apps/terminal-palette.h b/apps/terminal-palette.h index 801bae46..2e8b8428 100644 --- a/apps/terminal-palette.h +++ b/apps/terminal-palette.h @@ -1,13 +1,15 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2012-2018 K. Lange - * - * terminal-palette.h - Terminal color palette +/** + * @file apps/terminal-palette.h + * @brief Terminal color palette * * Provides the color table for both the basic 16 colors (here, * chosen from the Tango design documents), as well as the other * colors making up the basic 256 color palette derived from xterm. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2012-2018 K. Lange */ #define PALETTE_COLORS 256 diff --git a/apps/toaru_logo.h b/apps/toaru_logo.h index 39230afa..067f3d2f 100644 --- a/apps/toaru_logo.h +++ b/apps/toaru_logo.h @@ -1,14 +1,15 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2012 K. Lange - * - * toaru_logo.h - Generated by GIMP, ToaruOS logo +/** + * @file apps/toaru_logo.sh + * @brief Generated by GIMP, ToaruOS logo * * Used by sysinfo. Can be used by other things as well. * TODO: sysinfo should probably just load a bitmap? + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2021 K. Lange */ - static const struct { unsigned int width; unsigned int height; diff --git a/apps/vga-palette.h b/apps/vga-palette.h index 6e946c48..2c8f58f4 100644 --- a/apps/vga-palette.h +++ b/apps/vga-palette.h @@ -1,15 +1,16 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2012-2018 K. Lange - * - * vga-palette.h - 256-to-VGA palette +/** + * @brief VGA palette conversion * * Converts 256-color index values to closest matching 16-color * value for the VGA terminal. Note that values here are terminal * color codes, not the VGA color codes - the terminal converts * them to VGA color codes later. This was automatically generated * from a script, but I don't know where that script went. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2012-2018 K. Lange */ #define PALETTE_COLORS 256 uint32_t vga_colors[PALETTE_COLORS] = { diff --git a/base/usr/include/kernel/pipe.h b/base/usr/include/kernel/pipe.h index 1571c631..3b07df99 100644 --- a/base/usr/include/kernel/pipe.h +++ b/base/usr/include/kernel/pipe.h @@ -1,8 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * - * Pipe - */ - #pragma once #include diff --git a/base/usr/include/kernel/shm.h b/base/usr/include/kernel/shm.h index 66294d8a..df15f250 100644 --- a/base/usr/include/kernel/shm.h +++ b/base/usr/include/kernel/shm.h @@ -1,5 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - */ #pragma once #include diff --git a/base/usr/include/kernel/tree.h b/base/usr/include/kernel/tree.h index 2207f84a..88212dd7 100644 --- a/base/usr/include/kernel/tree.h +++ b/base/usr/include/kernel/tree.h @@ -1,7 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * - * General-purpose tree implementation - */ #pragma once #include diff --git a/base/usr/include/toaru/auth.h b/base/usr/include/toaru/auth.h index 84fdec18..89f4e042 100644 --- a/base/usr/include/toaru/auth.h +++ b/base/usr/include/toaru/auth.h @@ -1,13 +1,14 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2013-2018 K. Lange - * - * Authentication Helpers +/** + * @brief Authentication Helpers * * This library allows multiple login programs (login, sudo, glogin) * to share authentication code by providing a single palce to check * passwords against /etc/master.passwd and to set typical login vars. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2013-2018 K. Lange */ #pragma once diff --git a/base/usr/include/toaru/button.h b/base/usr/include/toaru/button.h index 01042b3e..2c11479e 100644 --- a/base/usr/include/toaru/button.h +++ b/base/usr/include/toaru/button.h @@ -1,4 +1,7 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Draws buttons. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2018 K. Lange diff --git a/base/usr/include/toaru/confreader.h b/base/usr/include/toaru/confreader.h index 3405eb0e..5958de2b 100644 --- a/base/usr/include/toaru/confreader.h +++ b/base/usr/include/toaru/confreader.h @@ -1,15 +1,16 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange - * - * Configuration File Reader +/** + * @brief Configuration File Reader * * Reads an implementation of the INI "standard". Note that INI * isn't actually a standard. We support the following: * - ; comments * - foo=bar keyword assignment * - [sections] + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018 K. Lange */ #pragma once diff --git a/base/usr/include/toaru/decodeutf8.h b/base/usr/include/toaru/decodeutf8.h index b10fde64..5a9d0b9f 100644 --- a/base/usr/include/toaru/decodeutf8.h +++ b/base/usr/include/toaru/decodeutf8.h @@ -1,13 +1,16 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange +/** + * @brief Decode UTF8 to codepoints. * * This is a simple implementation of a UTF-8 decoder with an * equivalent API to the older third-party (and much cooler...) * version that ToaruOS used to use. Keep feeding it bytes and * will eventually set *codep to a codepoint. Should also be able * to detect bad UTF-8. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018 K. Lange */ #include diff --git a/base/usr/include/toaru/decorations.h b/base/usr/include/toaru/decorations.h index f403ae86..ebccb90a 100644 --- a/base/usr/include/toaru/decorations.h +++ b/base/usr/include/toaru/decorations.h @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Client-side Window Decoration library + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2012-2018 K. Lange - * - * Client-side Window Decoration library */ #pragma once diff --git a/base/usr/include/toaru/graphics.h b/base/usr/include/toaru/graphics.h index 1be73098..39c4da35 100644 --- a/base/usr/include/toaru/graphics.h +++ b/base/usr/include/toaru/graphics.h @@ -1,5 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - */ #pragma once #include <_cheader.h> diff --git a/base/usr/include/toaru/inflate.h b/base/usr/include/toaru/inflate.h index 5f532e05..6f44194f 100644 --- a/base/usr/include/toaru/inflate.h +++ b/base/usr/include/toaru/inflate.h @@ -1,4 +1,7 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief DEFLATE inflater + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2020 K. Lange diff --git a/base/usr/include/toaru/list.h b/base/usr/include/toaru/list.h index 95165bd7..5850da72 100644 --- a/base/usr/include/toaru/list.h +++ b/base/usr/include/toaru/list.h @@ -1,7 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * - * General-purpose list implementations. - */ #pragma once #include <_cheader.h> diff --git a/base/usr/include/toaru/tree.h b/base/usr/include/toaru/tree.h index fd5971d5..06bc8e31 100644 --- a/base/usr/include/toaru/tree.h +++ b/base/usr/include/toaru/tree.h @@ -1,7 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * - * General-purpose tree implementation - */ #pragma once #include <_cheader.h> diff --git a/base/usr/include/toaru/yutani-server.h b/base/usr/include/toaru/yutani-server.h index d4c88cdc..8593b287 100644 --- a/base/usr/include/toaru/yutani-server.h +++ b/base/usr/include/toaru/yutani-server.h @@ -1,10 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Internal definitions used by the Yutani compositor. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2013-2018 K. Lange - * - * Internal definitions used by the Yutani compositor - * and extension plugins. + * Copyright (C) 2013-2021 K. Lange */ #pragma once diff --git a/base/usr/include/toaru/yutani.h b/base/usr/include/toaru/yutani.h index 97f65258..1d2bcdda 100644 --- a/base/usr/include/toaru/yutani.h +++ b/base/usr/include/toaru/yutani.h @@ -1,11 +1,12 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2014-2018 K. Lange - * - * Yutani Client Library +/** + * @brief Yutani Client Library * * Client library for the compositing window system. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2014-2021 K. Lange */ #pragma once diff --git a/boot/link.ld b/boot/link.ld index 180608a8..9a9a0f3e 100644 --- a/boot/link.ld +++ b/boot/link.ld @@ -1,6 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * Kernel linker script for x86 - */ OUTPUT_FORMAT("binary") /*ENTRY(start) */ phys = 0x7c00; diff --git a/lib/auth.c b/lib/auth.c index a5cbd18b..9e0b3e68 100644 --- a/lib/auth.c +++ b/lib/auth.c @@ -1,12 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Authentication routines. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2013-2018 K. Lange - * - * Authentication methods - * */ - #include #include #include diff --git a/lib/button.c b/lib/button.c index 07902229..8da8061c 100644 --- a/lib/button.c +++ b/lib/button.c @@ -1,9 +1,12 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Button "widget" + * + * Really just a function to render a button... + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2018 K. Lange - * - * ttk button widget */ #include #include diff --git a/lib/confreader.c b/lib/confreader.c index 1b585b98..f415bc72 100644 --- a/lib/confreader.c +++ b/lib/confreader.c @@ -1,15 +1,16 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange - * - * Configuration File Reader +/** + * @brief Configuration File Reader * * Reads an implementation of the INI "standard". Note that INI * isn't actually a standard. We support the following: * - ; comments * - foo=bar keyword assignment * - [sections] + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018 K. Lange */ #include #include diff --git a/lib/decorations.c b/lib/decorations.c index 688b35f3..30a3eb60 100644 --- a/lib/decorations.c +++ b/lib/decorations.c @@ -1,11 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Client-side Window Decoration library + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2012-2018 K. Lange - * - * Client-side Window Decoration library */ - #include #include #include diff --git a/lib/graphics.c b/lib/graphics.c index 2ecdafce..1681c4d7 100644 --- a/lib/graphics.c +++ b/lib/graphics.c @@ -1,11 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Generic Graphics library for ToaruOS + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2012-2018 K. Lange - * - * Generic Graphics library for ToaruOS + * Copyright (C) 2012-2021 K. Lange */ - #include #include #include diff --git a/lib/hashmap.c b/lib/hashmap.c index a0fec5bd..86d36788 100644 --- a/lib/hashmap.c +++ b/lib/hashmap.c @@ -1,9 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Generic hashmap implementation. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2013-2018 K. Lange */ - #include #include diff --git a/lib/icon_cache.c b/lib/icon_cache.c index abfdd2ac..fe6060fd 100644 --- a/lib/icon_cache.c +++ b/lib/icon_cache.c @@ -1,12 +1,13 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange - * - * icon_cache - caches icons +/** + * @brief icon_cache - caches icons * * Used be a few different applications. * Probably needs scaling? + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018 K. Lange */ #include #include diff --git a/lib/inflate.c b/lib/inflate.c index 6d0348e0..aea30400 100644 --- a/lib/inflate.c +++ b/lib/inflate.c @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief libtoaru_inflate: Methods for decompressing DEFLATE and gzip payloads. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2020 K. Lange - * - * libtoaru_inflate: Methods for decompressing DEFLATE and gzip payloads. */ #include #include diff --git a/lib/jpeg.c b/lib/jpeg.c index 4ca32b22..95c191aa 100644 --- a/lib/jpeg.c +++ b/lib/jpeg.c @@ -1,10 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief libtoaru_jpeg: Decode simple JPEGs. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2018 K. Lange * - * libtoaru_jpeg: Decode simple JPEGs. - * * Adapted from Raul Aguaviva's Python "micro JPEG visualizer": * * MIT License diff --git a/lib/json.c b/lib/json.c index 504684d5..0f6749ef 100644 --- a/lib/json.c +++ b/lib/json.c @@ -1,3 +1,11 @@ +/** + * @brief JSON parser. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018-2021 K. Lange + */ #include #include #include diff --git a/lib/kbd.c b/lib/kbd.c index 7577fb40..7704d6eb 100644 --- a/lib/kbd.c +++ b/lib/kbd.c @@ -1,14 +1,15 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2012-2018 K. Lange - * - * General-purpose keyboard conversion library. +/** + * @brief General-purpose keyboard conversion library. * * This provides similar functionality to xkb: * - It provides mappings for keyboards from locales * - It translates incoming key presses to key names * - It translates incoming keys to escape sequences + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2012-2018 K. Lange */ #include diff --git a/lib/list.c b/lib/list.c index f27de711..b8918298 100644 --- a/lib/list.c +++ b/lib/list.c @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief General-purpose list implementations. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2011-2018 K. Lange - * - * General-purpose list implementations. */ #ifdef _KERNEL_ diff --git a/lib/markup.c b/lib/markup.c index 5d68d97f..ced785df 100644 --- a/lib/markup.c +++ b/lib/markup.c @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief HTML-ish markup parser. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2018 K. Lange - * - * Markup parser. */ #include #include diff --git a/lib/markup_text.c b/lib/markup_text.c index c71e841b..9c26d1e4 100644 --- a/lib/markup_text.c +++ b/lib/markup_text.c @@ -1,3 +1,11 @@ +/** + * @brief Marked up text label renderer. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2021 K. Lange + */ #include #include #include diff --git a/lib/menu.c b/lib/menu.c index 33a0fb1c..3a322c33 100644 --- a/lib/menu.c +++ b/lib/menu.c @@ -1,12 +1,13 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange - * - * menu - Provides menus. +/** + * @brief Cascading graphical menu library. * * C reimplementation of the original Python menu library. * Used to provide menu bars and the applications menu. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2018-2021 K. Lange */ #include #include diff --git a/lib/pex.c b/lib/pex.c index b37f8f9f..e156e91f 100644 --- a/lib/pex.c +++ b/lib/pex.c @@ -1,12 +1,13 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief pex - Packet EXchange client library + * + * Provides a friendly interface to the "Packet Exchange" + * functionality provided by the packetfs kernel interface. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2014-2018 K. Lange - * - * pex - Packet EXchange client library - * - * Provides a friendly interface to the "Packet Exchange" - * functionality provided by the packetfs kernel module. */ #include #include diff --git a/lib/png.c b/lib/png.c index 37662b76..75a15fe3 100644 --- a/lib/png.c +++ b/lib/png.c @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief PNG decoder. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2020 K. Lange - * - * libtoaru_png: PNG decoder */ #include #include diff --git a/lib/rline.c b/lib/rline.c index 30702663..55001225 100644 --- a/lib/rline.c +++ b/lib/rline.c @@ -1,11 +1,16 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Line editor + * + * Interactive line input editor with syntax highlighting for + * a handful of languages. Based on an old version of Bim. + * Used by the shell and Kuroko. + * + * This library is generally usable on Linux and even Windows. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2018 K. Lange - * - * Experimental rline replacement with syntax highlighting, based - * on bim's highlighting and line editing. - * + * Copyright (C) 2018-2021 K. Lange */ #define _XOPEN_SOURCE #define _DEFAULT_SOURCE diff --git a/lib/rline_exp.c b/lib/rline_exp.c index 44c6de27..741262e5 100644 --- a/lib/rline_exp.c +++ b/lib/rline_exp.c @@ -1,6 +1,13 @@ +/** + * @brief Dummy library to provide rline to Python, but + * our Python port is currently on hold. + * + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * @copyright 2018-2021 K. Lange + */ #include #include -/* dummy lib */ void * rline_exp_for_python(void * _stdin, void * _stdout, char * prompt) { diff --git a/lib/termemu.c b/lib/termemu.c index 1aecfb9c..f0713cc6 100644 --- a/lib/termemu.c +++ b/lib/termemu.c @@ -1,22 +1,11 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Terrible little ANSI escape parser. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2014-2018 K. Lange - * - * Portable library for terminal emulation. */ - -#ifdef _KERNEL_ -# include -# include -# include -static void _spin_lock(volatile int * foo) { return; } -static void _spin_unlock(volatile int * foo) { return; } -# define rgba(r,g,b,a) (((uint32_t)a * 0x1000000) + ((uint32_t)r * 0x10000) + ((uint32_t)g * 0x100) + ((uint32_t)b * 0x1)) -# define rgb(r,g,b) rgba(r,g,b,0xFF) -# define atof(i) (0.0f) -#include -#else #include #include @@ -27,9 +16,6 @@ static void _spin_unlock(volatile int * foo) { return; } #include #include -#define _spin_lock spin_lock -#define _spin_unlock spin_unlock -#endif #define MAX_ARGS 1024 @@ -597,9 +583,9 @@ static void _ansi_put(term_state_t * s, char c) { } void ansi_put(term_state_t * s, char c) { - _spin_lock(&s->lock); + spin_lock(&s->lock); _ansi_put(s, c); - _spin_unlock(&s->lock); + spin_unlock(&s->lock); } term_state_t * ansi_init(term_state_t * s, int w, int y, term_callbacks_t * callbacks_in) { diff --git a/lib/tree.c b/lib/tree.c index fd29c59a..f206e2c5 100644 --- a/lib/tree.c +++ b/lib/tree.c @@ -1,9 +1,10 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief General-purpose tree implementation + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2011-2018 K. Lange - * - * General-purpose tree implementation */ #ifdef _KERNEL_ diff --git a/lib/yutani.c b/lib/yutani.c index e1d7e0ff..9396c72f 100644 --- a/lib/yutani.c +++ b/lib/yutani.c @@ -1,11 +1,12 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab +/** + * @brief Yutani Client Library + * + * Client library for the compositing window system. + * + * @copyright * This file is part of ToaruOS and is released under the terms * of the NCSA / University of Illinois License - see LICENSE.md * Copyright (C) 2014-2018 K. Lange - * - * Yutani Client Library - * - * Client library for the compositing window system. */ #include #include diff --git a/libc/pwd/pwd.c b/libc/pwd/pwd.c index 3afc8009..f24f3afe 100644 --- a/libc/pwd/pwd.c +++ b/libc/pwd/pwd.c @@ -1,12 +1,13 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * This file is part of ToaruOS and is released under the terms - * of the NCSA / University of Illinois License - see LICENSE.md - * Copyright (C) 2013-2018 K. Lange - * +/*** * getpwent, setpwent, endpwent, fgetpwent * getpwuid, getpwnam * * These functions manage entries in the password files. + * + * @copyright + * This file is part of ToaruOS and is released under the terms + * of the NCSA / University of Illinois License - see LICENSE.md + * Copyright (C) 2013-2018 K. Lange */ #include diff --git a/linker/link.ld b/linker/link.ld index 6d7434a0..b3bb33e0 100644 --- a/linker/link.ld +++ b/linker/link.ld @@ -1,6 +1,3 @@ -/* vim: tabstop=4 shiftwidth=4 noexpandtab - * - */ ENTRY(_start) SECTIONS