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
				
			
		
							
								
								
									
										33
									
								
								tmk_core/common/avr/_print.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										33
									
								
								tmk_core/common/avr/_print.h
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,33 @@
 | 
			
		|||
/* 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 "avr/xprintf.h"
 | 
			
		||||
 | 
			
		||||
// Create user & normal print defines
 | 
			
		||||
#define print(s) xputs(PSTR(s))
 | 
			
		||||
#define println(s) xputs(PSTR(s "\r\n"))
 | 
			
		||||
#define uprint(s) print(s)
 | 
			
		||||
#define uprintln(s) println(s)
 | 
			
		||||
#define uprintf(fmt, ...) xprintf(fmt, ##__VA_ARGS__)
 | 
			
		||||
							
								
								
									
										20
									
								
								tmk_core/common/avr/printf.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										20
									
								
								tmk_core/common/avr/printf.c
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,20 @@
 | 
			
		|||
/*
 | 
			
		||||
Copyright 2011 Jun Wako <wakojun@gmail.com>
 | 
			
		||||
 | 
			
		||||
This program is free software: you can redistribute it and/or modify
 | 
			
		||||
it under the terms of the GNU General Public License as published by
 | 
			
		||||
the Free Software Foundation, either version 2 of the License, or
 | 
			
		||||
(at your option) any later version.
 | 
			
		||||
 | 
			
		||||
This program is distributed in the hope that it will be useful,
 | 
			
		||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
			
		||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
			
		||||
GNU General Public License for more details.
 | 
			
		||||
 | 
			
		||||
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 "xprintf.h"
 | 
			
		||||
#include "sendchar.h"
 | 
			
		||||
 | 
			
		||||
void print_set_sendchar(sendchar_func_t func) { xdev_out(func); }
 | 
			
		||||
							
								
								
									
										2
									
								
								tmk_core/common/avr/printf.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								tmk_core/common/avr/printf.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,2 @@
 | 
			
		|||
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/xprintf.S
 | 
			
		||||
TMK_COMMON_SRC += $(PLATFORM_COMMON_DIR)/printf.c
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue