sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Factor Morse code functions out of platform code.

This commit is contained in:
Gareth McMullin 2015-02-28 22:05:10 -08:00
parent 5d136398e1
commit 75001a4421
19 changed files with 146 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile
View File

@ -29,6 +29,7 @@ SRC = \
lpc43xx.c \
kinetis.c \
main.c \
morse.c \
nrf51.c \
platform.c \
sam3x.c \

1
src/adiv5_jtagdp.c
View File

@ -27,6 +27,7 @@
#include "adiv5.h"
#include "jtag_scan.h"
#include "jtagtap.h"
#include "morse.h"
#include <stdlib.h>

1
src/adiv5_swdp.c
View File

@ -30,6 +30,7 @@
#include "jtagtap.h"
#include "command.h"
#include "morse.h"
#include <stdlib.h>

1
src/command.c
View File

@ -32,6 +32,7 @@
#include "jtag_scan.h"
#include "target.h"
#include "morse.h"
#include "adiv5.h"

32
src/include/morse.h Normal file
View File

@ -0,0 +1,32 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2015 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* 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 3 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/>.
*/
#ifndef __MORSE_H
#define __MORSE_H
#include <stdbool.h>
extern const char *morse_msg;
void morse(const char *msg, char repeat);
bool morse_update(void);
#endif

1
src/jtag_scan.c
View File

@ -30,6 +30,7 @@
#include "general.h"
#include "jtagtap.h"
#include "morse.h"
#include "jtag_scan.h"
#include "gdb_packet.h"

100
src/morse.c Normal file
View File

@ -0,0 +1,100 @@
/*
* This file is part of the Black Magic Debug project.
*
* Copyright (C) 2015 Black Sphere Technologies Ltd.
* Written by Gareth McMullin <gareth@blacksphere.co.nz>
*
* 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 3 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 "general.h"
#include "morse.h"
/* Morse code patterns and lengths */
static const struct {
uint16_t code;
uint8_t bits;
} morse_letter[] = {
{ 0b00011101, 8}, // 'A' .-
{ 0b000101010111, 12}, // 'B' -...
{ 0b00010111010111, 14}, // 'C' -.-.
{ 0b0001010111, 10}, // 'D' -..
{ 0b0001, 4}, // 'E' .
{ 0b000101110101, 12}, // 'F' ..-.
{ 0b000101110111, 12}, // 'G' --.
{ 0b0001010101, 10}, // 'H' ....
{ 0b000101, 6}, // 'I' ..
{0b0001110111011101, 16}, // 'J' .---
{ 0b000111010111, 12}, // 'K' -.-
{ 0b000101011101, 12}, // 'L' .-..
{ 0b0001110111, 10}, // 'M' --
{ 0b00010111, 8}, // 'N' -.
{ 0b00011101110111, 14}, // 'O' ---
{ 0b00010111011101, 14}, // 'P' .--.
{0b0001110101110111, 16}, // 'Q' --.-
{ 0b0001011101, 10}, // 'R' .-.
{ 0b00010101, 8}, // 'S' ...
{ 0b000111, 6}, // 'T' -
{ 0b0001110101, 10}, // 'U' ..-
{ 0b000111010101, 12}, // 'V' ...-
{ 0b000111011101, 12}, // 'W' .--
{ 0b00011101010111, 14}, // 'X' -..-
{0b0001110111010111, 16}, // 'Y' -.--
{ 0b00010101110111, 14}, // 'Z' --..
};
const char *morse_msg;
static const char * volatile morse_ptr;
static char morse_repeat;
void morse(const char *msg, char repeat)
{
morse_msg = morse_ptr = msg;
morse_repeat = repeat;
}
bool morse_update(void)
{
static uint16_t code;
static uint8_t bits;
if (!morse_ptr)
return false;
if (!bits) {
char c = *morse_ptr++;
if (!c) {
if(morse_repeat) {
morse_ptr = morse_msg;
c = *morse_ptr++;
} else {
morse_ptr = 0;
return false;
}
}
if ((c >= 'A') && (c <= 'Z')) {
c -= 'A';
code = morse_letter[c].code;
bits = morse_letter[c].bits;
} else {
code = 0; bits = 4;
}
}
bool ret = code & 1;
code >>= 1;
bits--;
return ret;
}

85
src/platforms/f4discovery/platform.c
View File

@ -33,17 +33,14 @@
#include <libopencm3/usb/usbd.h>
#include "jtag_scan.h"
#include <usbuart.h>
#include <ctype.h>
#include "usbuart.h"
#include "morse.h"
uint8_t running_status;
volatile uint32_t timeout_counter;
jmp_buf fatal_error_jmpbuf;
static void morse_update(void);
int platform_init(void)
{
/* Check the USER button*/
@ -116,83 +113,7 @@ void sys_tick_handler(void)
if(timeout_counter)
timeout_counter--;
morse_update();
}
/* Morse code patterns and lengths */
static const struct {
uint16_t code;
uint8_t bits;
} morse_letter[] = {
{ 0b00011101, 8}, // 'A' .-
{ 0b000101010111, 12}, // 'B' -...
{ 0b00010111010111, 14}, // 'C' -.-.
{ 0b0001010111, 10}, // 'D' -..
{ 0b0001, 4}, // 'E' .
{ 0b000101110101, 12}, // 'F' ..-.
{ 0b000101110111, 12}, // 'G' --.
{ 0b0001010101, 10}, // 'H' ....
{ 0b000101, 6}, // 'I' ..
{0b0001110111011101, 16}, // 'J' .---
{ 0b000111010111, 12}, // 'K' -.-
{ 0b000101011101, 12}, // 'L' .-..
{ 0b0001110111, 10}, // 'M' --
{ 0b00010111, 8}, // 'N' -.
{ 0b00011101110111, 14}, // 'O' ---
{ 0b00010111011101, 14}, // 'P' .--.
{0b0001110101110111, 16}, // 'Q' --.-
{ 0b0001011101, 10}, // 'R' .-.
{ 0b00010101, 8}, // 'S' ...
{ 0b000111, 6}, // 'T' -
{ 0b0001110101, 10}, // 'U' ..-
{ 0b000111010101, 12}, // 'V' ...-
{ 0b000111011101, 12}, // 'W' .--
{ 0b00011101010111, 14}, // 'X' -..-
{0b0001110111010111, 16}, // 'Y' -.--
{ 0b00010101110111, 14}, // 'Z' --..
};
const char *morse_msg;
static const char * volatile morse_ptr;
static char morse_repeat;
void morse(const char *msg, char repeat)
{
morse_msg = morse_ptr = msg;
morse_repeat = repeat;
SET_ERROR_STATE(0);
}
static void morse_update(void)
{
static uint16_t code;
static uint8_t bits;
if(!morse_ptr) return;
if(!bits) {
char c = *morse_ptr++;
if(!c) {
if(morse_repeat) {
morse_ptr = morse_msg;
c = *morse_ptr++;
} else {
morse_ptr = 0;
return;
}
}
if((c >= 'A') && (c <= 'Z')) {
c -= 'A';
code = morse_letter[c].code;
bits = morse_letter[c].bits;
} else {
code = 0; bits = 4;
}
}
SET_ERROR_STATE(code & 1);
code >>= 1; bits--;
SET_ERROR_STATE(morse_update());
}
const char *platform_target_voltage(void)

4
src/platforms/f4discovery/platform.h
View File

@ -34,6 +34,7 @@
#include <alloca.h>
#include "gdb_packet.h"
#include "morse.h"
#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
@ -156,8 +157,6 @@ extern volatile uint32_t timeout_counter;
extern jmp_buf fatal_error_jmpbuf;
extern const char *morse_msg;
#define gpio_set_val(port, pin, val) do { \
if(val) \
gpio_set((port), (pin)); \
@ -180,7 +179,6 @@ extern const char *morse_msg;
}
int platform_init(void);
void morse(const char *msg, char repeat);
const char *platform_target_voltage(void);
void platform_delay(uint32_t delay);
static inline int platform_hwversion(void)

8
src/platforms/launchpad-icdi/platform.c
View File

@ -19,14 +19,6 @@ jmp_buf fatal_error_jmpbuf;
uint8_t running_status;
volatile uint32_t timeout_counter;
const char *morse_msg;
void morse(const char *msg, char repeat)
{
(void) msg;
(void) repeat;
}
void sys_tick_handler(void)
{
if(timeout_counter)

2
src/platforms/launchpad-icdi/platform.h
View File

@ -23,7 +23,6 @@ extern usbd_device *usbdev;
extern jmp_buf fatal_error_jmpbuf;
extern uint8_t running_status;
extern const char *morse_msg;
extern volatile uint32_t timeout_counter;
#define TMS_PORT GPIOA_BASE
@ -112,7 +111,6 @@ extern usbd_driver lm4f_usb_driver;
#define PLATFORM_HAS_TRACESWO
int platform_init(void);
void morse(const char *msg, char repeat);
inline static void gpio_set_val(uint32_t port, uint8_t pin, uint8_t val) {
gpio_write(port, pin, val == 0 ? 0 : 0xff);

8
src/platforms/libftdi/platform.c
View File

@ -267,11 +267,3 @@ void platform_delay(uint32_t delay)
usleep(delay * 100000);
}
void morse(const char *msg, char repeat)
{
(void)repeat;
if (msg != NULL)
fprintf(stderr,"%s\n", msg);
}

3
src/platforms/libftdi/platform.h
View File

@ -40,12 +40,9 @@
#define PLATFORM_FATAL_ERROR(error) abort()
#define PLATFORM_SET_FATAL_ERROR_RECOVERY()
#define morse_msg 0
extern struct ftdi_context *ftdic;
int platform_init(int argc, char **argv);
void morse(const char *msg, char repeat);
const char *platform_target_voltage(void);
void platform_delay(uint32_t delay);

86
src/platforms/native/platform.c
View File

@ -34,17 +34,14 @@
#include <libopencm3/stm32/f1/adc.h>
#include "jtag_scan.h"
#include <usbuart.h>
#include <ctype.h>
#include "usbuart.h"
#include "morse.h"
uint8_t running_status;
volatile uint32_t timeout_counter;
jmp_buf fatal_error_jmpbuf;
static void morse_update(void);
static void adc_init(void);
/* Pins PB[7:5] are used to detect hardware revision.
@ -187,83 +184,7 @@ void sys_tick_handler(void)
if(timeout_counter)
timeout_counter--;
morse_update();
}
/* Morse code patterns and lengths */
static const struct {
uint16_t code;
uint8_t bits;
} morse_letter[] = {
{ 0b00011101, 8}, // 'A' .-
{ 0b000101010111, 12}, // 'B' -...
{ 0b00010111010111, 14}, // 'C' -.-.
{ 0b0001010111, 10}, // 'D' -..
{ 0b0001, 4}, // 'E' .
{ 0b000101110101, 12}, // 'F' ..-.
{ 0b000101110111, 12}, // 'G' --.
{ 0b0001010101, 10}, // 'H' ....
{ 0b000101, 6}, // 'I' ..
{0b0001110111011101, 16}, // 'J' .---
{ 0b000111010111, 12}, // 'K' -.-
{ 0b000101011101, 12}, // 'L' .-..
{ 0b0001110111, 10}, // 'M' --
{ 0b00010111, 8}, // 'N' -.
{ 0b00011101110111, 14}, // 'O' ---
{ 0b00010111011101, 14}, // 'P' .--.
{0b0001110101110111, 16}, // 'Q' --.-
{ 0b0001011101, 10}, // 'R' .-.
{ 0b00010101, 8}, // 'S' ...
{ 0b000111, 6}, // 'T' -
{ 0b0001110101, 10}, // 'U' ..-
{ 0b000111010101, 12}, // 'V' ...-
{ 0b000111011101, 12}, // 'W' .--
{ 0b00011101010111, 14}, // 'X' -..-
{0b0001110111010111, 16}, // 'Y' -.--
{ 0b00010101110111, 14}, // 'Z' --..
};
const char *morse_msg;
static const char * volatile morse_ptr;
static char morse_repeat;
void morse(const char *msg, char repeat)
{
morse_msg = morse_ptr = msg;
morse_repeat = repeat;
SET_ERROR_STATE(0);
}
static void morse_update(void)
{
static uint16_t code;
static uint8_t bits;
if(!morse_ptr) return;
if(!bits) {
char c = *morse_ptr++;
if(!c) {
if(morse_repeat) {
morse_ptr = morse_msg;
c = *morse_ptr++;
} else {
morse_ptr = 0;
return;
}
}
if((c >= 'A') && (c <= 'Z')) {
c -= 'A';
code = morse_letter[c].code;
bits = morse_letter[c].bits;
} else {
code = 0; bits = 4;
}
}
SET_ERROR_STATE(code & 1);
code >>= 1; bits--;
SET_ERROR_STATE(morse_update());
}
static void adc_init(void)
@ -351,3 +272,4 @@ void setup_vbus_irq(void)
exti15_10_isr();
}

3
src/platforms/native/platform.h
View File

@ -35,6 +35,7 @@
#include <alloca.h>
#include "gdb_packet.h"
#include "morse.h"
#define INLINE_GPIO
#define CDCACM_PACKET_SIZE 64
@ -163,7 +164,6 @@ extern volatile uint32_t timeout_counter;
extern jmp_buf fatal_error_jmpbuf;
extern const char *morse_msg;
#define gpio_set_val(port, pin, val) do { \
if(val) \
@ -187,7 +187,6 @@ extern const char *morse_msg;
} while (0)
int platform_init(void);
void morse(const char *msg, char repeat);
const char *platform_target_voltage(void);
int platform_hwversion(void);
void platform_delay(uint32_t delay);

8
src/platforms/stlink/platform.c
View File

@ -156,14 +156,6 @@ void sys_tick_handler(void)
timeout_counter--;
}
const char *morse_msg;
void morse(const char *msg, char repeat)
{
(void)repeat;
morse_msg = msg;
}
const char *platform_target_voltage(void)
{
return "unknown";

3
src/platforms/stlink/platform.h
View File

@ -143,8 +143,6 @@ extern volatile uint32_t timeout_counter;
extern jmp_buf fatal_error_jmpbuf;
extern const char *morse_msg;
#define gpio_set_val(port, pin, val) do { \
if(val) \
gpio_set((port), (pin)); \
@ -166,7 +164,6 @@ extern uint16_t led_idle_run;
} while (0)
int platform_init(void);
void morse(const char *msg, char repeat);
const char *platform_target_voltage(void);
void platform_delay(uint32_t delay);
void platform_srst_set_val(bool assert);

8
src/platforms/swlink/platform.c
View File

@ -124,14 +124,6 @@ void sys_tick_handler(void)
timeout_counter--;
}
const char *morse_msg;
void morse(const char *msg, char repeat)
{
(void)repeat;
morse_msg = msg;
}
const char *platform_target_voltage(void)
{
return "unknown";

2
src/platforms/swlink/platform.h
View File

@ -141,7 +141,6 @@ extern volatile uint32_t timeout_counter;
extern jmp_buf fatal_error_jmpbuf;
extern const char *morse_msg;
#define gpio_set_val(port, pin, val) do { \
if(val) \
@ -164,7 +163,6 @@ extern const char *morse_msg;
}
int platform_init(void);
void morse(const char *msg, char repeat);
const char *platform_target_voltage(void);
void platform_delay(uint32_t delay);