Refactor platform logic within print.h (#11863)
* Remove GCC check from debug * Remove platform logic from common.mk * Refactor platform logic within print.h * restore debug.c format * headers * Rename function pointer type * review comments * Update tmk_core/common/printf.c Co-authored-by: Nick Brassel <nick@tzarc.org> * Format Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
parent
72e515547a
commit
1f2fe2eab9
17 changed files with 224 additions and 283 deletions
34
tmk_core/common/arm_atsam/_print.h
Normal file
34
tmk_core/common/arm_atsam/_print.h
Normal file
|
@ -0,0 +1,34 @@
|
|||
/* Copyright 2012 Jun Wako <wakojun@gmail.com> */
|
||||
/* Very basic print functions, intended to be used with usb_debug_only.c
|
||||
* http://www.pjrc.com/teensy/
|
||||
* Copyright (c) 2008 PJRC.COM, LLC
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "arm_atsam/printf.h"
|
||||
|
||||
// Create user & normal print defines
|
||||
#define xprintf(fmt, ...) __xprintf(fmt, ##__VA_ARGS__)
|
||||
#define print(s) xprintf(s)
|
||||
#define println(s) xprintf(s "\r\n")
|
||||
#define uprint(s) print(s)
|
||||
#define uprintln(s) println(s)
|
||||
#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
|
|
@ -15,11 +15,13 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "printf.h"
|
||||
#include "sendchar.h"
|
||||
|
||||
#ifdef CONSOLE_ENABLE
|
||||
|
||||
# include "samd51j18a.h"
|
||||
# include "arm_atsam_protocol.h"
|
||||
# include "printf.h"
|
||||
# include <string.h>
|
||||
# include <stdarg.h>
|
||||
|
||||
|
@ -66,3 +68,5 @@ void console_printf(char *fmt, ...) {
|
|||
}
|
||||
|
||||
#endif // CONSOLE_ENABLE
|
||||
|
||||
void print_set_sendchar(sendchar_func_t send) {}
|
1
tmk_core/common/arm_atsam/printf.mk
Normal file
1
tmk_core/common/arm_atsam/printf.mk
Normal file
|
@ -0,0 +1 @@
|
|||
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
|
Loading…
Add table
Add a link
Reference in a new issue