--- /dev/null
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+import java.io.*;
+
+public class AltosDebug {
+
+ public static final byte WR_CONFIG = 0x1d;
+ public static final byte RD_CONFIG = 0x24;
+ public static final byte CONFIG_TIMERS_OFF = (1 << 3);
+ public static final byte CONFIG_DMA_PAUSE = (1 << 2);
+ public static final byte CONFIG_TIMER_SUSPEND = (1 << 1);
+ public static final byte SET_FLASH_INFO_PAGE = (1 << 0);
+
+ public static final byte GET_PC = 0x28;
+ public static final byte READ_STATUS = 0x34;
+ public static final byte STATUS_CHIP_ERASE_DONE = (byte) (1 << 7);
+ public static final byte STATUS_PCON_IDLE = (1 << 6);
+ public static final byte STATUS_CPU_HALTED = (1 << 5);
+ public static final byte STATUS_POWER_MODE_0 = (1 << 4);
+ public static final byte STATUS_HALT_STATUS = (1 << 3);
+ public static final byte STATUS_DEBUG_LOCKED = (1 << 2);
+ public static final byte STATUS_OSCILLATOR_STABLE = (1 << 1);
+ public static final byte STATUS_STACK_OVERFLOW = (1 << 0);
+
+ public static final byte SET_HW_BRKPNT = 0x3b;
+ public static byte HW_BRKPNT_N(byte n) { return (byte) ((n) << 3); }
+ public static final byte HW_BRKPNT_N_MASK = (0x3 << 3);
+ public static final byte HW_BRKPNT_ENABLE = (1 << 2);
+
+ public static final byte HALT = 0x44;
+ public static final byte RESUME = 0x4c;
+ public static byte DEBUG_INSTR(byte n) { return (byte) (0x54|(n)); }
+ public static final byte STEP_INSTR = 0x5c;
+ public static byte STEP_REPLACE(byte n) { return (byte) (0x64|(n)); }
+ public static final byte GET_CHIP_ID = 0x68;
+
+
+ AltosLink link;
+
+ boolean debug_mode;
+
+ void ensure_debug_mode() {
+ if (!debug_mode) {
+ link.printf("D\n");
+ try {
+ link.flush_input();
+ } catch (InterruptedException ie) {
+ }
+ debug_mode = true;
+ }
+ }
+
+ void dump_memory(String header, int address, byte[] bytes, int start, int len) {
+ System.out.printf("%s\n", header);
+ for (int j = 0; j < len; j++) {
+ if ((j & 15) == 0) {
+ if (j != 0)
+ System.out.printf("\n");
+ System.out.printf ("%04x:", address + j);
+ }
+ System.out.printf(" %02x", bytes[start + j]);
+ }
+ System.out.printf("\n");
+ }
+
+ public void close() {
+ link.close();
+ }
+
+ /*
+ * Write target memory
+ */
+ public void write_memory(int address, byte[] bytes, int start, int len) {
+ ensure_debug_mode();
+// dump_memory("write_memory", address, bytes, start, len);
+ link.printf("O %x %x\n", len, address);
+ for (int i = 0; i < len; i++)
+ link.printf("%02x", bytes[start + i]);
+ }
+
+ public void write_memory(int address, byte[] bytes) {
+ write_memory(address, bytes, 0, bytes.length);
+ }
+
+ /*
+ * Read target memory
+ */
+ public byte[] read_memory(int address, int length)
+ throws IOException, InterruptedException {
+ byte[] data = new byte[length];
+
+ link.flush_input();
+ ensure_debug_mode();
+ link.printf("I %x %x\n", length, address);
+ int i = 0;
+ int start = 0;
+ while (i < length) {
+ String line = link.get_reply().trim();
+ if (!AltosLib.ishex(line) || line.length() % 2 != 0)
+ throw new IOException(
+ String.format
+ ("Invalid reply \"%s\"", line));
+ int this_time = line.length() / 2;
+ for (int j = 0; j < this_time; j++)
+ data[start + j] = (byte) ((AltosLib.fromhex(line.charAt(j*2)) << 4) +
+ AltosLib.fromhex(line.charAt(j*2+1)));
+ start += this_time;
+ i += this_time;
+ }
+// dump_memory("read_memory", address, data, 0, length);
+
+ return data;
+ }
+
+ /*
+ * Write raw bytes to the debug link using the 'P' command
+ */
+ public void write_bytes(byte[] bytes) throws IOException {
+ int i = 0;
+ ensure_debug_mode();
+ while (i < bytes.length) {
+ int this_time = bytes.length - i;
+ if (this_time > 8)
+ this_time = 0;
+ link.printf("P");
+ for (int j = 0; j < this_time; j++)
+ link.printf(" %02x", bytes[i+j]);
+ link.printf("\n");
+ i += this_time;
+ }
+ }
+
+ public void write_byte(byte b) throws IOException {
+ byte[] bytes = { b };
+ write_bytes(bytes);
+ }
+
+ /*
+ * Read raw bytes from the debug link using the 'G' command
+ */
+ public byte[] read_bytes(int length)
+ throws IOException, InterruptedException {
+
+ link.flush_input();
+ ensure_debug_mode();
+ link.printf("G %x\n", length);
+ int i = 0;
+ byte[] data = new byte[length];
+ while (i < length) {
+ String line = link.get_reply();
+
+ if (line == null)
+ throw new IOException("Timeout in read_bytes");
+ line = line.trim();
+ String tokens[] = line.split("\\s+");
+ for (int j = 0; j < tokens.length; j++) {
+ if (!AltosLib.ishex(tokens[j]) ||
+ tokens[j].length() != 2)
+ throw new IOException(
+ String.format
+ ("Invalid read_bytes reply \"%s\"", line));
+ try {
+ if (i + j >= length)
+ throw new IOException(
+ String.format
+ ("Invalid read_bytes reply \"%s\"", line));
+ else
+ data[i + j] = (byte) Integer.parseInt(tokens[j], 16);
+ } catch (NumberFormatException ne) {
+ throw new IOException(
+ String.format
+ ("Invalid read_bytes reply \"%s\"", line));
+ }
+ }
+ i += tokens.length;
+ }
+ return data;
+ }
+
+ public byte read_byte() throws IOException, InterruptedException {
+ return read_bytes(1)[0];
+ }
+
+ public byte debug_instr(byte[] instruction) throws IOException, InterruptedException {
+ byte[] command = new byte[1 + instruction.length];
+ command[0] = DEBUG_INSTR((byte) instruction.length);
+ for (int i = 0; i < instruction.length; i++)
+ command[i+1] = instruction[i];
+ write_bytes(command);
+ return read_byte();
+ }
+
+ public byte resume() throws IOException, InterruptedException {
+ write_byte(RESUME);
+ return read_byte();
+ }
+
+ public int read_uint16() throws IOException, InterruptedException {
+ byte[] d = read_bytes(2);
+ return ((int) (d[0] & 0xff) << 8) | (d[1] & 0xff);
+ }
+
+ public int read_uint8() throws IOException, InterruptedException {
+ byte[] d = read_bytes(1);
+ return (int) (d[0] & 0xff);
+ }
+
+ public int get_chip_id() throws IOException, InterruptedException {
+ write_byte(GET_CHIP_ID);
+ return read_uint16();
+ }
+
+ public int get_pc() throws IOException, InterruptedException {
+ write_byte(GET_PC);
+ return read_uint16();
+ }
+
+ public byte read_status() throws IOException, InterruptedException {
+ write_byte(READ_STATUS);
+ return read_byte();
+ }
+
+ static final byte LJMP = 0x02;
+
+ public void set_pc(int pc) throws IOException, InterruptedException {
+ byte high = (byte) (pc >> 8);
+ byte low = (byte) pc;
+ byte[] jump_mem = { LJMP, high, low };
+ debug_instr(jump_mem);
+ }
+
+ public boolean check_connection() throws IOException, InterruptedException {
+ byte reply = read_status();
+ if ((reply & STATUS_CHIP_ERASE_DONE) == 0)
+ return false;
+ if ((reply & STATUS_PCON_IDLE) != 0)
+ return false;
+ if ((reply & STATUS_POWER_MODE_0) == 0)
+ return false;
+ return true;
+ }
+
+ public AltosRomconfig romconfig() {
+ try {
+ byte[] bytes = read_memory(0xa0, 10);
+ return new AltosRomconfig(bytes, 0);
+ } catch (IOException ie) {
+ } catch (InterruptedException ie) {
+ }
+ return new AltosRomconfig();
+ }
+
+ /*
+ * Reset target
+ */
+ public void reset() {
+ link.printf ("R\n");
+ }
+
+ public AltosDebug (AltosLink link) {
+ this.link = link;
+ }
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+import java.io.*;
+
+public class AltosFlash {
+ File file;
+ FileInputStream input;
+ AltosHexfile image;
+ AltosLink link;
+ AltosDebug debug;
+ AltosRomconfig rom_config;
+ boolean aborted;
+ AltosFlashListener listener;
+
+ static final byte MOV_direct_data = (byte) 0x75;
+ static final byte MOV_DPTR_data16 = (byte) 0x90;
+ static final byte MOV_A_data = (byte) 0x74;
+ static final byte MOVX_atDPTR_A = (byte) 0xf0;
+ static final byte MOVX_A_atDPTR = (byte) 0xe0;
+ static final byte INC_DPTR = (byte) 0xa3;
+ static final byte TRAP = (byte) 0xa5;
+
+ static final byte JB = (byte) 0x20;
+
+ static final byte MOV_A_direct = (byte) 0xe5;
+ static final byte MOV_direct1_direct2 = (byte) 0x85;
+ static final byte MOV_direct_A = (byte) 0xf5;
+ static final byte MOV_R0_data = (byte) (0x78 | 0);
+ static final byte MOV_R1_data = (byte) (0x78 | 1);
+ static final byte MOV_R2_data = (byte) (0x78 | 2);
+ static final byte MOV_R3_data = (byte) (0x78 | 3);
+ static final byte MOV_R4_data = (byte) (0x78 | 4);
+ static final byte MOV_R5_data = (byte) (0x78 | 5);
+ static final byte MOV_R6_data = (byte) (0x78 | 6);
+ static final byte MOV_R7_data = (byte) (0x78 | 7);
+ static final byte DJNZ_R0_rel = (byte) (0xd8 | 0);
+ static final byte DJNZ_R1_rel = (byte) (0xd8 | 1);
+ static final byte DJNZ_R2_rel = (byte) (0xd8 | 2);
+ static final byte DJNZ_R3_rel = (byte) (0xd8 | 3);
+ static final byte DJNZ_R4_rel = (byte) (0xd8 | 4);
+ static final byte DJNZ_R5_rel = (byte) (0xd8 | 5);
+ static final byte DJNZ_R6_rel = (byte) (0xd8 | 6);
+ static final byte DJNZ_R7_rel = (byte) (0xd8 | 7);
+
+ static final byte P1DIR = (byte) 0xFE;
+ static final byte P1 = (byte) 0x90;
+
+ /* flash controller */
+ static final byte FWT = (byte) 0xAB;
+ static final byte FADDRL = (byte) 0xAC;
+ static final byte FADDRH = (byte) 0xAD;
+ static final byte FCTL = (byte) 0xAE;
+ static final byte FCTL_BUSY = (byte) 0x80;
+ static final byte FCTL_BUSY_BIT = (byte) 7;
+ static final byte FCTL_SWBSY = (byte) 0x40;
+ static final byte FCTL_SWBSY_BIT = (byte) 6;
+ static final byte FCTL_CONTRD = (byte) 0x10;
+ static final byte FCTL_WRITE = (byte) 0x02;
+ static final byte FCTL_ERASE = (byte) 0x01;
+ static final byte FWDATA = (byte) 0xAF;
+
+ static final byte ACC = (byte) 0xE0;
+
+ /* offsets within the flash_page program */
+ static final int FLASH_ADDR_HIGH = 8;
+ static final int FLASH_ADDR_LOW = 11;
+ static final int RAM_ADDR_HIGH = 13;
+ static final int RAM_ADDR_LOW = 14;
+ static final int FLASH_WORDS_HIGH = 16;
+ static final int FLASH_WORDS_LOW = 18;
+ static final int FLASH_TIMING = 21;
+
+ /* sleep mode control */
+ static final int SLEEP = (byte) 0xbe;
+ static final int SLEEP_USB_EN = (byte) 0x80;
+ static final int SLEEP_XOSC_STB = (byte) 0x40;
+ static final int SLEEP_HFRC_STB = (byte) 0x20;
+ static final int SLEEP_RST_MASK = (byte) 0x18;
+ static final int SLEEP_RST_POWERON = (byte) 0x00;
+ static final int SLEEP_RST_EXTERNAL = (byte) 0x10;
+ static final int SLEEP_RST_WATCHDOG = (byte) 0x08;
+ static final int SLEEP_OSC_PD = (byte) 0x04;
+ static final int SLEEP_MODE_MASK = (byte) 0x03;
+ static final int SLEEP_MODE_PM0 = (byte) 0x00;
+ static final int SLEEP_MODE_PM1 = (byte) 0x01;
+ static final int SLEEP_MODE_PM2 = (byte) 0x02;
+ static final int SLEEP_MODE_PM3 = (byte) 0x03;
+
+ /* clock controller */
+ static final byte CLKCON = (byte) 0xC6;
+ static final byte CLKCON_OSC32K = (byte) 0x80;
+ static final byte CLKCON_OSC = (byte) 0x40;
+ static final byte CLKCON_TICKSPD = (byte) 0x38;
+ static final byte CLKCON_CLKSPD = (byte) 0x07;
+
+ static final byte[] flash_page_proto = {
+
+ MOV_direct_data, P1DIR, (byte) 0x02,
+ MOV_direct_data, P1, (byte) 0xFF,
+
+ MOV_direct_data, FADDRH, 0, /* FLASH_ADDR_HIGH */
+
+ MOV_direct_data, FADDRL, 0, /* FLASH_ADDR_LOW */
+
+ MOV_DPTR_data16, 0, 0, /* RAM_ADDR_HIGH, RAM_ADDR_LOW */
+
+ MOV_R7_data, 0, /* FLASH_WORDS_HIGH */
+
+ MOV_R6_data, 0, /* FLASH_WORDS_LOW */
+
+
+ MOV_direct_data, FWT, 0x20, /* FLASH_TIMING */
+
+ MOV_direct_data, FCTL, FCTL_ERASE,
+/* eraseWaitLoop: */
+ MOV_A_direct, FCTL,
+ JB, ACC|FCTL_BUSY_BIT, (byte) 0xfb,
+
+ MOV_direct_data, P1, (byte) 0xfd,
+
+ MOV_direct_data, FCTL, FCTL_WRITE,
+/* writeLoop: */
+ MOV_R5_data, 2,
+/* writeWordLoop: */
+ MOVX_A_atDPTR,
+ INC_DPTR,
+ MOV_direct_A, FWDATA,
+ DJNZ_R5_rel, (byte) 0xfa, /* writeWordLoop */
+/* writeWaitLoop: */
+ MOV_A_direct, FCTL,
+ JB, ACC|FCTL_SWBSY_BIT, (byte) 0xfb, /* writeWaitLoop */
+ DJNZ_R6_rel, (byte) 0xf1, /* writeLoop */
+ DJNZ_R7_rel, (byte) 0xef, /* writeLoop */
+
+ MOV_direct_data, P1DIR, (byte) 0x00,
+ MOV_direct_data, P1, (byte) 0xFF,
+ TRAP,
+ };
+
+ public byte[] make_flash_page(int flash_addr, int ram_addr, int byte_count) {
+ int flash_word_addr = flash_addr >> 1;
+ int flash_word_count = ((byte_count + 1) >> 1);
+
+ byte[] flash_page = new byte[flash_page_proto.length];
+ for (int i = 0; i < flash_page.length; i++)
+ flash_page[i] = flash_page_proto[i];
+
+ flash_page[FLASH_ADDR_HIGH] = (byte) (flash_word_addr >> 8);
+ flash_page[FLASH_ADDR_LOW] = (byte) (flash_word_addr);
+ flash_page[RAM_ADDR_HIGH] = (byte) (ram_addr >> 8);
+ flash_page[RAM_ADDR_LOW] = (byte) (ram_addr);
+
+ byte flash_words_low = (byte) (flash_word_count);
+ byte flash_words_high = (byte) (flash_word_count >> 8);
+ /* the flashing code has a minor 'bug' */
+ if (flash_words_low != 0)
+ flash_words_high++;
+
+ flash_page[FLASH_WORDS_HIGH] = (byte) flash_words_high;
+ flash_page[FLASH_WORDS_LOW] = (byte) flash_words_low;
+ return flash_page;
+ }
+
+ static byte[] set_clkcon_fast = {
+ MOV_direct_data, CLKCON, 0x00
+ };
+
+ static byte[] get_sleep = {
+ MOV_A_direct, SLEEP
+ };
+
+ public void clock_init() throws IOException, InterruptedException {
+ if (debug != null) {
+ debug.debug_instr(set_clkcon_fast);
+
+ byte status;
+ for (int times = 0; times < 20; times++) {
+ Thread.sleep(1);
+ status = debug.debug_instr(get_sleep);
+ if ((status & SLEEP_XOSC_STB) != 0)
+ return;
+ }
+ throw new IOException("Failed to initialize target clock");
+ }
+ }
+
+ void action(String s, int percent) {
+ if (listener != null && !aborted)
+ listener.position(s, percent);
+ }
+
+ void action(int part, int total) {
+ int percent = 100 * part / total;
+ action(String.format("%d/%d (%d%%)",
+ part, total, percent),
+ percent);
+ }
+
+ void altos_run(int pc) throws IOException, InterruptedException {
+ debug.set_pc(pc);
+ int set_pc = debug.get_pc();
+ if (pc != set_pc)
+ throw new IOException("Failed to set target program counter");
+ debug.resume();
+
+ for (int times = 0; times < 20; times++) {
+ byte status = debug.read_status();
+ if ((status & AltosDebug.STATUS_CPU_HALTED) != 0)
+ return;
+ }
+
+ throw new IOException("Failed to execute program on target");
+ }
+
+ public void flash() {
+ try {
+ if (!check_rom_config())
+ throw new IOException("Invalid rom config settings");
+ if (image.address + image.data.length > 0x8000)
+ throw new IOException(String.format("Flash image too long %d",
+ image.address +
+ image.data.length));
+ if ((image.address & 0x3ff) != 0)
+ throw new IOException(String.format("Flash image must start on page boundary (is 0x%x)",
+ image.address));
+ int ram_address = 0xf000;
+ int flash_prog = 0xf400;
+
+ /*
+ * Store desired config values into image
+ */
+ rom_config.write(image);
+ /*
+ * Bring up the clock
+ */
+ clock_init();
+
+ int remain = image.data.length;
+ int flash_addr = image.address;
+ int image_start = 0;
+
+ action("start", 0);
+ action(0, image.data.length);
+ while (remain > 0 && !aborted) {
+ int this_time = remain;
+ if (this_time > 0x400)
+ this_time = 0x400;
+
+ if (debug != null) {
+ /* write the data */
+ debug.write_memory(ram_address, image.data,
+ image_start, this_time);
+
+ /* write the flash program */
+ byte[] flash_page = make_flash_page(flash_addr,
+ ram_address,
+ this_time);
+ debug.write_memory(flash_prog, flash_page);
+
+ altos_run(flash_prog);
+ byte[] check = debug.read_memory(flash_addr, this_time);
+ for (int i = 0; i < this_time; i++)
+ if (check[i] != image.data[image_start + i])
+ throw new IOException(String.format("Flash write failed at 0x%x (%02x != %02x)",
+ image.address + image_start + i,
+ check[i], image.data[image_start + i]));
+ } else {
+ Thread.sleep(100);
+ }
+
+ remain -= this_time;
+ flash_addr += this_time;
+ image_start += this_time;
+
+ action(image.data.length - remain, image.data.length);
+ }
+ if (!aborted) {
+ action("done", 100);
+ if (debug != null) {
+ debug.set_pc(image.address);
+ debug.resume();
+ }
+ }
+ if (debug != null)
+ debug.close();
+ } catch (IOException ie) {
+ action(ie.getMessage(), -1);
+ abort();
+ } catch (InterruptedException ie) {
+ abort();
+ }
+ }
+
+ public void close() {
+ if (debug != null)
+ debug.close();
+ }
+
+ synchronized public void abort() {
+ aborted = true;
+ close();
+ }
+
+ public boolean check_rom_config() {
+ if (debug == null)
+ return true;
+ if (rom_config == null)
+ rom_config = debug.romconfig();
+ return rom_config != null && rom_config.valid();
+ }
+
+ public void set_romconfig (AltosRomconfig romconfig) {
+ rom_config = romconfig;
+ }
+
+ public AltosRomconfig romconfig() {
+ if (!check_rom_config())
+ return null;
+ return rom_config;
+ }
+
+ public AltosFlash(File file, AltosLink link, AltosFlashListener listener)
+ throws IOException, FileNotFoundException, InterruptedException {
+ this.file = file;
+ this.link = link;
+ this.listener = listener;
+ if (link != null)
+ debug = new AltosDebug(link);
+ input = new FileInputStream(file);
+ image = new AltosHexfile(input);
+ if (debug != null && !debug.check_connection()) {
+ debug.close();
+ throw new IOException("Debug port not connected");
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+public interface AltosFlashListener {
+ public void position(String label, int percent);
+}
--- /dev/null
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+import java.io.*;
+import java.util.LinkedList;
+import java.util.Arrays;
+
+class HexFileInputStream extends PushbackInputStream {
+ public int line;
+
+ public HexFileInputStream(FileInputStream o) {
+ super(new BufferedInputStream(o));
+ line = 1;
+ }
+
+ public int read() throws IOException {
+ int c = super.read();
+ if (c == '\n')
+ line++;
+ return c;
+ }
+
+ public void unread(int c) throws IOException {
+ if (c == '\n')
+ line--;
+ if (c != -1)
+ super.unread(c);
+ }
+}
+
+class HexRecord implements Comparable<Object> {
+ public int address;
+ public int type;
+ public byte checksum;
+ public byte[] data;
+
+ static final int NORMAL = 0;
+ static final int EOF = 1;
+ static final int EXTENDED_ADDRESS = 2;
+
+ enum read_state {
+ marker,
+ length,
+ address,
+ type,
+ data,
+ checksum,
+ newline,
+ white,
+ done,
+ }
+
+ boolean ishex(int c) {
+ if ('0' <= c && c <= '9')
+ return true;
+ if ('a' <= c && c <= 'f')
+ return true;
+ if ('A' <= c && c <= 'F')
+ return true;
+ return false;
+ }
+
+ boolean isspace(int c) {
+ switch (c) {
+ case ' ':
+ case '\t':
+ return true;
+ }
+ return false;
+ }
+
+ int fromhex(int c) {
+ if ('0' <= c && c <= '9')
+ return c - '0';
+ if ('a' <= c && c <= 'f')
+ return c - 'a' + 10;
+ if ('A' <= c && c <= 'F')
+ return c - 'A' + 10;
+ return -1;
+ }
+
+ public byte checksum() {
+ byte got = 0;
+
+ got += data.length;
+ got += (address >> 8) & 0xff;
+ got += (address ) & 0xff;
+ got += type;
+ for (int i = 0; i < data.length; i++)
+ got += data[i];
+ return (byte) (-got);
+ }
+
+ public int compareTo(Object other) {
+ HexRecord o = (HexRecord) other;
+ return address - o.address;
+ }
+
+ public String toString() {
+ return String.format("%04x: %02x (%d)", address, type, data.length);
+ }
+
+ public HexRecord(HexFileInputStream input) throws IOException {
+ read_state state = read_state.marker;
+ int nhexbytes = 0;
+ int hex = 0;
+ int ndata = 0;
+ byte got_checksum;
+
+ while (state != read_state.done) {
+ int c = input.read();
+ if (c < 0 && state != read_state.white)
+ throw new IOException(String.format("%d: Unexpected EOF", input.line));
+ if (c == ' ')
+ continue;
+ switch (state) {
+ case marker:
+ if (c != ':')
+ throw new IOException("Missing ':'");
+ state = read_state.length;
+ nhexbytes = 2;
+ hex = 0;
+ break;
+ case length:
+ case address:
+ case type:
+ case data:
+ case checksum:
+ if(!ishex(c))
+ throw new IOException(String.format("Non-hex char '%c'", c));
+ hex = hex << 4 | fromhex(c);
+ --nhexbytes;
+ if (nhexbytes != 0)
+ break;
+
+ switch (state) {
+ case length:
+ data = new byte[hex];
+ state = read_state.address;
+ nhexbytes = 4;
+ break;
+ case address:
+ address = hex;
+ state = read_state.type;
+ nhexbytes = 2;
+ break;
+ case type:
+ type = hex;
+ if (data.length > 0)
+ state = read_state.data;
+ else
+ state = read_state.checksum;
+ nhexbytes = 2;
+ ndata = 0;
+ break;
+ case data:
+ data[ndata] = (byte) hex;
+ ndata++;
+ nhexbytes = 2;
+ if (ndata == data.length)
+ state = read_state.checksum;
+ break;
+ case checksum:
+ checksum = (byte) hex;
+ state = read_state.newline;
+ break;
+ default:
+ break;
+ }
+ hex = 0;
+ break;
+ case newline:
+ if (c != '\n' && c != '\r')
+ throw new IOException("Missing newline");
+ state = read_state.white;
+ break;
+ case white:
+ if (!isspace(c)) {
+ input.unread(c);
+ state = read_state.done;
+ }
+ break;
+ case done:
+ break;
+ }
+ }
+ got_checksum = checksum();
+ if (got_checksum != checksum)
+ throw new IOException(String.format("Invalid checksum (read 0x%02x computed 0x%02x)\n",
+ checksum, got_checksum));
+ }
+}
+
+public class AltosHexfile {
+ public int address;
+ public byte[] data;
+
+ public byte get_byte(int a) {
+ return data[a - address];
+ }
+
+ public AltosHexfile(FileInputStream file) throws IOException {
+ HexFileInputStream input = new HexFileInputStream(file);
+ LinkedList<HexRecord> record_list = new LinkedList<HexRecord>();
+ boolean done = false;
+
+ while (!done) {
+ HexRecord record = new HexRecord(input);
+
+ if (record.type == HexRecord.EOF)
+ done = true;
+ else
+ record_list.add(record);
+ }
+
+ long extended_addr = 0;
+ long base = 0xffffffff;
+ long bound = 0x00000000;
+ for (HexRecord record : record_list) {
+ switch (record.type) {
+ case 0:
+ long addr = extended_addr + record.address;
+ long r_bound = addr + record.data.length;
+ if (addr < base)
+ base = addr;
+ if (r_bound > bound)
+ bound = r_bound;
+ break;
+ case 1:
+ break;
+ case 2:
+ if (record.data.length != 2)
+ throw new IOException("invalid extended segment address record");
+ extended_addr = ((record.data[0] << 8) + (record.data[1])) << 4;
+ break;
+ case 4:
+ if (record.data.length != 2)
+ throw new IOException("invalid extended segment address record");
+ extended_addr = ((record.data[0] << 8) + (record.data[1])) << 16;
+ break;
+ default:
+ throw new IOException ("invalid hex record type");
+ }
+ }
+
+ if (base >= bound)
+ throw new IOException("invalid hex file");
+
+ if (bound - base > 4 * 1024 * 1024)
+ throw new IOException("hex file too large");
+
+ data = new byte[(int) (bound - base)];
+ address = (int) base;
+ Arrays.fill(data, (byte) 0xff);
+
+ /* Paint the records into the new array */
+ for (HexRecord record : record_list) {
+ switch (record.type) {
+ case 0:
+ long addr = extended_addr + record.address;
+ long r_bound = addr + record.data.length;
+ for (int j = 0; j < record.data.length; j++)
+ data[(int) (addr - base) + j] = record.data[j];
+ break;
+ case 1:
+ break;
+ case 2:
+ if (record.data.length != 2)
+ throw new IOException("invalid extended segment address record");
+ extended_addr = ((record.data[0] << 8) + (record.data[1])) << 4;
+ break;
+ case 4:
+ if (record.data.length != 2)
+ throw new IOException("invalid extended segment address record");
+ extended_addr = ((record.data[0] << 8) + (record.data[1])) << 16;
+ break;
+ default:
+ throw new IOException ("invalid hex record type");
+ }
+ }
+ }
+}
\ No newline at end of file
--- /dev/null
+/*
+ * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+package org.altusmetrum.altoslib_1;
+
+import java.io.*;
+
+public class AltosRomconfig {
+ public boolean valid;
+ public int version;
+ public int check;
+ public int serial_number;
+ public int radio_calibration;
+
+ static int get_int(byte[] bytes, int start, int len) {
+ int v = 0;
+ int o = 0;
+ while (len > 0) {
+ v = v | ((((int) bytes[start]) & 0xff) << o);
+ start++;
+ len--;
+ o += 8;
+ }
+ return v;
+ }
+
+ static void put_int(int value, byte[] bytes, int start, int len) {
+ while (len > 0) {
+ bytes[start] = (byte) (value & 0xff);
+ start++;
+ len--;
+ value >>= 8;
+ }
+ }
+
+ static void put_string(String value, byte[] bytes, int start) {
+ for (int i = 0; i < value.length(); i++)
+ bytes[start + i] = (byte) value.charAt(i);
+ }
+
+ static final int AO_USB_DESC_STRING = 3;
+
+ static void put_usb_serial(int value, byte[] bytes, int start) {
+ int offset = start + 0xa;
+ int string_num = 0;
+
+ while (offset < bytes.length && bytes[offset] != 0) {
+ if (bytes[offset + 1] == AO_USB_DESC_STRING) {
+ ++string_num;
+ if (string_num == 4)
+ break;
+ }
+ offset += ((int) bytes[offset]) & 0xff;
+ }
+ if (offset >= bytes.length || bytes[offset] == 0)
+ return;
+ int len = ((((int) bytes[offset]) & 0xff) - 2) / 2;
+ String fmt = String.format("%%0%dd", len);
+
+ String s = String.format(fmt, value);
+ if (s.length() != len) {
+ System.out.printf("weird usb length issue %s isn't %d\n",
+ s, len);
+ return;
+ }
+ for (int i = 0; i < len; i++) {
+ bytes[offset + 2 + i*2] = (byte) s.charAt(i);
+ bytes[offset + 2 + i*2+1] = 0;
+ }
+ }
+
+ public AltosRomconfig(byte[] bytes, int offset) {
+ version = get_int(bytes, offset + 0, 2);
+ check = get_int(bytes, offset + 2, 2);
+ if (check == (~version & 0xffff)) {
+ switch (version) {
+ case 2:
+ case 1:
+ serial_number = get_int(bytes, offset + 4, 2);
+ radio_calibration = get_int(bytes, offset + 6, 4);
+ valid = true;
+ break;
+ }
+ }
+ }
+
+ public AltosRomconfig(AltosHexfile hexfile) {
+ this(hexfile.data, 0xa0 - hexfile.address);
+ }
+
+ public void write(byte[] bytes, int offset) throws IOException {
+ if (!valid)
+ throw new IOException("rom configuration invalid");
+
+ if (offset < 0 || bytes.length < offset + 10)
+ throw new IOException("image cannot contain rom config");
+
+ AltosRomconfig existing = new AltosRomconfig(bytes, offset);
+ if (!existing.valid)
+ throw new IOException("image does not contain existing rom config");
+
+ switch (existing.version) {
+ case 2:
+ put_usb_serial(serial_number, bytes, offset);
+ case 1:
+ put_int(serial_number, bytes, offset + 4, 2);
+ put_int(radio_calibration, bytes, offset + 6, 4);
+ break;
+ }
+ }
+
+ public void write (AltosHexfile hexfile) throws IOException {
+ write(hexfile.data, 0xa0 - hexfile.address);
+ AltosRomconfig check = new AltosRomconfig(hexfile);
+ if (!check.valid())
+ throw new IOException("writing new rom config failed\n");
+ }
+
+ public AltosRomconfig(int in_serial_number, int in_radio_calibration) {
+ valid = true;
+ version = 1;
+ check = (~version & 0xffff);
+ serial_number = in_serial_number;
+ radio_calibration = in_radio_calibration;
+ }
+
+ public boolean valid() {
+ return valid && serial_number != 0;
+ }
+
+ public AltosRomconfig() {
+ valid = false;
+ }
+}
AltosConfigValues.java \
AltosConvert.java \
AltosCRCException.java \
+ AltosDebug.java \
AltosEepromChunk.java \
AltosEepromIterable.java \
AltosEepromLog.java \
AltosEepromRecord.java \
AltosEepromTeleScience.java \
AltosFile.java \
+ AltosFlash.java \
+ AltosFlashListener.java \
AltosFlightReader.java \
AltosFrequency.java \
AltosGPS.java \
AltosGPSQuery.java \
AltosGPSSat.java \
AltosGreatCircle.java \
+ AltosHexfile.java \
AltosIdleMonitor.java \
AltosIdleMonitorListener.java \
AltosIgnite.java \
AltosRecordTM.java \
AltosRecordMM.java \
AltosReplayReader.java \
+ AltosRomconfig.java \
AltosSensorMM.java \
AltosSensorTM.java \
AltosState.java \
+++ /dev/null
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.io.*;
-import org.altusmetrum.altosuilib_1.*;
-
-public class AltosDebug extends AltosSerial {
-
- public static final byte WR_CONFIG = 0x1d;
- public static final byte RD_CONFIG = 0x24;
- public static final byte CONFIG_TIMERS_OFF = (1 << 3);
- public static final byte CONFIG_DMA_PAUSE = (1 << 2);
- public static final byte CONFIG_TIMER_SUSPEND = (1 << 1);
- public static final byte SET_FLASH_INFO_PAGE = (1 << 0);
-
- public static final byte GET_PC = 0x28;
- public static final byte READ_STATUS = 0x34;
- public static final byte STATUS_CHIP_ERASE_DONE = (byte) (1 << 7);
- public static final byte STATUS_PCON_IDLE = (1 << 6);
- public static final byte STATUS_CPU_HALTED = (1 << 5);
- public static final byte STATUS_POWER_MODE_0 = (1 << 4);
- public static final byte STATUS_HALT_STATUS = (1 << 3);
- public static final byte STATUS_DEBUG_LOCKED = (1 << 2);
- public static final byte STATUS_OSCILLATOR_STABLE = (1 << 1);
- public static final byte STATUS_STACK_OVERFLOW = (1 << 0);
-
- public static final byte SET_HW_BRKPNT = 0x3b;
- public static byte HW_BRKPNT_N(byte n) { return (byte) ((n) << 3); }
- public static final byte HW_BRKPNT_N_MASK = (0x3 << 3);
- public static final byte HW_BRKPNT_ENABLE = (1 << 2);
-
- public static final byte HALT = 0x44;
- public static final byte RESUME = 0x4c;
- public static byte DEBUG_INSTR(byte n) { return (byte) (0x54|(n)); }
- public static final byte STEP_INSTR = 0x5c;
- public static byte STEP_REPLACE(byte n) { return (byte) (0x64|(n)); }
- public static final byte GET_CHIP_ID = 0x68;
-
-
- boolean debug_mode;
-
- void ensure_debug_mode() {
- if (!debug_mode) {
- printf("D\n");
- try {
- flush_input();
- } catch (InterruptedException ie) {
- }
- debug_mode = true;
- }
- }
-
- void dump_memory(String header, int address, byte[] bytes, int start, int len) {
- System.out.printf("%s\n", header);
- for (int j = 0; j < len; j++) {
- if ((j & 15) == 0) {
- if (j != 0)
- System.out.printf("\n");
- System.out.printf ("%04x:", address + j);
- }
- System.out.printf(" %02x", bytes[start + j]);
- }
- System.out.printf("\n");
- }
-
- /*
- * Write target memory
- */
- public void write_memory(int address, byte[] bytes, int start, int len) {
- ensure_debug_mode();
-// dump_memory("write_memory", address, bytes, start, len);
- printf("O %x %x\n", len, address);
- for (int i = 0; i < len; i++)
- printf("%02x", bytes[start + i]);
- }
-
- public void write_memory(int address, byte[] bytes) {
- write_memory(address, bytes, 0, bytes.length);
- }
-
- /*
- * Read target memory
- */
- public byte[] read_memory(int address, int length)
- throws IOException, InterruptedException {
- byte[] data = new byte[length];
-
- flush_input();
- ensure_debug_mode();
- printf("I %x %x\n", length, address);
- int i = 0;
- int start = 0;
- while (i < length) {
- String line = get_reply().trim();
- if (!Altos.ishex(line) || line.length() % 2 != 0)
- throw new IOException(
- String.format
- ("Invalid reply \"%s\"", line));
- int this_time = line.length() / 2;
- for (int j = 0; j < this_time; j++)
- data[start + j] = (byte) ((Altos.fromhex(line.charAt(j*2)) << 4) +
- Altos.fromhex(line.charAt(j*2+1)));
- start += this_time;
- i += this_time;
- }
-// dump_memory("read_memory", address, data, 0, length);
-
- return data;
- }
-
- /*
- * Write raw bytes to the debug link using the 'P' command
- */
- public void write_bytes(byte[] bytes) throws IOException {
- int i = 0;
- ensure_debug_mode();
- while (i < bytes.length) {
- int this_time = bytes.length - i;
- if (this_time > 8)
- this_time = 0;
- printf("P");
- for (int j = 0; j < this_time; j++)
- printf(" %02x", bytes[i+j]);
- printf("\n");
- i += this_time;
- }
- }
-
- public void write_byte(byte b) throws IOException {
- byte[] bytes = { b };
- write_bytes(bytes);
- }
-
- /*
- * Read raw bytes from the debug link using the 'G' command
- */
- public byte[] read_bytes(int length)
- throws IOException, InterruptedException {
-
- flush_input();
- ensure_debug_mode();
- printf("G %x\n", length);
- int i = 0;
- byte[] data = new byte[length];
- while (i < length) {
- String line = get_reply();
-
- if (line == null)
- throw new IOException("Timeout in read_bytes");
- line = line.trim();
- String tokens[] = line.split("\\s+");
- for (int j = 0; j < tokens.length; j++) {
- if (!Altos.ishex(tokens[j]) ||
- tokens[j].length() != 2)
- throw new IOException(
- String.format
- ("Invalid read_bytes reply \"%s\"", line));
- try {
- if (i + j >= length)
- throw new IOException(
- String.format
- ("Invalid read_bytes reply \"%s\"", line));
- else
- data[i + j] = (byte) Integer.parseInt(tokens[j], 16);
- } catch (NumberFormatException ne) {
- throw new IOException(
- String.format
- ("Invalid read_bytes reply \"%s\"", line));
- }
- }
- i += tokens.length;
- }
- return data;
- }
-
- public byte read_byte() throws IOException, InterruptedException {
- return read_bytes(1)[0];
- }
-
- public byte debug_instr(byte[] instruction) throws IOException, InterruptedException {
- byte[] command = new byte[1 + instruction.length];
- command[0] = DEBUG_INSTR((byte) instruction.length);
- for (int i = 0; i < instruction.length; i++)
- command[i+1] = instruction[i];
- write_bytes(command);
- return read_byte();
- }
-
- public byte resume() throws IOException, InterruptedException {
- write_byte(RESUME);
- return read_byte();
- }
-
- public int read_uint16() throws IOException, InterruptedException {
- byte[] d = read_bytes(2);
- return ((int) (d[0] & 0xff) << 8) | (d[1] & 0xff);
- }
-
- public int read_uint8() throws IOException, InterruptedException {
- byte[] d = read_bytes(1);
- return (int) (d[0] & 0xff);
- }
-
- public int get_chip_id() throws IOException, InterruptedException {
- write_byte(GET_CHIP_ID);
- return read_uint16();
- }
-
- public int get_pc() throws IOException, InterruptedException {
- write_byte(GET_PC);
- return read_uint16();
- }
-
- public byte read_status() throws IOException, InterruptedException {
- write_byte(READ_STATUS);
- return read_byte();
- }
-
- static final byte LJMP = 0x02;
-
- public void set_pc(int pc) throws IOException, InterruptedException {
- byte high = (byte) (pc >> 8);
- byte low = (byte) pc;
- byte[] jump_mem = { LJMP, high, low };
- debug_instr(jump_mem);
- }
-
- public boolean check_connection() throws IOException, InterruptedException {
- byte reply = read_status();
- if ((reply & STATUS_CHIP_ERASE_DONE) == 0)
- return false;
- if ((reply & STATUS_PCON_IDLE) != 0)
- return false;
- if ((reply & STATUS_POWER_MODE_0) == 0)
- return false;
- return true;
- }
-
- public AltosRomconfig romconfig() {
- try {
- byte[] bytes = read_memory(0xa0, 10);
- return new AltosRomconfig(bytes, 0);
- } catch (IOException ie) {
- } catch (InterruptedException ie) {
- }
- return new AltosRomconfig();
- }
-
- /*
- * Reset target
- */
- public void reset() {
- printf ("R\n");
- }
-
- public AltosDebug (AltosDevice in_device) throws FileNotFoundException, AltosSerialInUseException {
- super(in_device);
- }
-}
\ No newline at end of file
+++ /dev/null
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.awt.event.*;
-import javax.swing.*;
-import java.io.*;
-import org.altusmetrum.altosuilib_1.*;
-
-public class AltosFlash {
- File file;
- FileInputStream input;
- AltosHexfile image;
- JFrame frame;
- AltosDevice debug_dongle;
- AltosDebug debug;
- AltosRomconfig rom_config;
- ActionListener listener;
- boolean aborted;
-
- static final byte MOV_direct_data = (byte) 0x75;
- static final byte MOV_DPTR_data16 = (byte) 0x90;
- static final byte MOV_A_data = (byte) 0x74;
- static final byte MOVX_atDPTR_A = (byte) 0xf0;
- static final byte MOVX_A_atDPTR = (byte) 0xe0;
- static final byte INC_DPTR = (byte) 0xa3;
- static final byte TRAP = (byte) 0xa5;
-
- static final byte JB = (byte) 0x20;
-
- static final byte MOV_A_direct = (byte) 0xe5;
- static final byte MOV_direct1_direct2 = (byte) 0x85;
- static final byte MOV_direct_A = (byte) 0xf5;
- static final byte MOV_R0_data = (byte) (0x78 | 0);
- static final byte MOV_R1_data = (byte) (0x78 | 1);
- static final byte MOV_R2_data = (byte) (0x78 | 2);
- static final byte MOV_R3_data = (byte) (0x78 | 3);
- static final byte MOV_R4_data = (byte) (0x78 | 4);
- static final byte MOV_R5_data = (byte) (0x78 | 5);
- static final byte MOV_R6_data = (byte) (0x78 | 6);
- static final byte MOV_R7_data = (byte) (0x78 | 7);
- static final byte DJNZ_R0_rel = (byte) (0xd8 | 0);
- static final byte DJNZ_R1_rel = (byte) (0xd8 | 1);
- static final byte DJNZ_R2_rel = (byte) (0xd8 | 2);
- static final byte DJNZ_R3_rel = (byte) (0xd8 | 3);
- static final byte DJNZ_R4_rel = (byte) (0xd8 | 4);
- static final byte DJNZ_R5_rel = (byte) (0xd8 | 5);
- static final byte DJNZ_R6_rel = (byte) (0xd8 | 6);
- static final byte DJNZ_R7_rel = (byte) (0xd8 | 7);
-
- static final byte P1DIR = (byte) 0xFE;
- static final byte P1 = (byte) 0x90;
-
- /* flash controller */
- static final byte FWT = (byte) 0xAB;
- static final byte FADDRL = (byte) 0xAC;
- static final byte FADDRH = (byte) 0xAD;
- static final byte FCTL = (byte) 0xAE;
- static final byte FCTL_BUSY = (byte) 0x80;
- static final byte FCTL_BUSY_BIT = (byte) 7;
- static final byte FCTL_SWBSY = (byte) 0x40;
- static final byte FCTL_SWBSY_BIT = (byte) 6;
- static final byte FCTL_CONTRD = (byte) 0x10;
- static final byte FCTL_WRITE = (byte) 0x02;
- static final byte FCTL_ERASE = (byte) 0x01;
- static final byte FWDATA = (byte) 0xAF;
-
- static final byte ACC = (byte) 0xE0;
-
- /* offsets within the flash_page program */
- static final int FLASH_ADDR_HIGH = 8;
- static final int FLASH_ADDR_LOW = 11;
- static final int RAM_ADDR_HIGH = 13;
- static final int RAM_ADDR_LOW = 14;
- static final int FLASH_WORDS_HIGH = 16;
- static final int FLASH_WORDS_LOW = 18;
- static final int FLASH_TIMING = 21;
-
- /* sleep mode control */
- static final int SLEEP = (byte) 0xbe;
- static final int SLEEP_USB_EN = (byte) 0x80;
- static final int SLEEP_XOSC_STB = (byte) 0x40;
- static final int SLEEP_HFRC_STB = (byte) 0x20;
- static final int SLEEP_RST_MASK = (byte) 0x18;
- static final int SLEEP_RST_POWERON = (byte) 0x00;
- static final int SLEEP_RST_EXTERNAL = (byte) 0x10;
- static final int SLEEP_RST_WATCHDOG = (byte) 0x08;
- static final int SLEEP_OSC_PD = (byte) 0x04;
- static final int SLEEP_MODE_MASK = (byte) 0x03;
- static final int SLEEP_MODE_PM0 = (byte) 0x00;
- static final int SLEEP_MODE_PM1 = (byte) 0x01;
- static final int SLEEP_MODE_PM2 = (byte) 0x02;
- static final int SLEEP_MODE_PM3 = (byte) 0x03;
-
- /* clock controller */
- static final byte CLKCON = (byte) 0xC6;
- static final byte CLKCON_OSC32K = (byte) 0x80;
- static final byte CLKCON_OSC = (byte) 0x40;
- static final byte CLKCON_TICKSPD = (byte) 0x38;
- static final byte CLKCON_CLKSPD = (byte) 0x07;
-
- static final byte[] flash_page_proto = {
-
- MOV_direct_data, P1DIR, (byte) 0x02,
- MOV_direct_data, P1, (byte) 0xFF,
-
- MOV_direct_data, FADDRH, 0, /* FLASH_ADDR_HIGH */
-
- MOV_direct_data, FADDRL, 0, /* FLASH_ADDR_LOW */
-
- MOV_DPTR_data16, 0, 0, /* RAM_ADDR_HIGH, RAM_ADDR_LOW */
-
- MOV_R7_data, 0, /* FLASH_WORDS_HIGH */
-
- MOV_R6_data, 0, /* FLASH_WORDS_LOW */
-
-
- MOV_direct_data, FWT, 0x20, /* FLASH_TIMING */
-
- MOV_direct_data, FCTL, FCTL_ERASE,
-/* eraseWaitLoop: */
- MOV_A_direct, FCTL,
- JB, ACC|FCTL_BUSY_BIT, (byte) 0xfb,
-
- MOV_direct_data, P1, (byte) 0xfd,
-
- MOV_direct_data, FCTL, FCTL_WRITE,
-/* writeLoop: */
- MOV_R5_data, 2,
-/* writeWordLoop: */
- MOVX_A_atDPTR,
- INC_DPTR,
- MOV_direct_A, FWDATA,
- DJNZ_R5_rel, (byte) 0xfa, /* writeWordLoop */
-/* writeWaitLoop: */
- MOV_A_direct, FCTL,
- JB, ACC|FCTL_SWBSY_BIT, (byte) 0xfb, /* writeWaitLoop */
- DJNZ_R6_rel, (byte) 0xf1, /* writeLoop */
- DJNZ_R7_rel, (byte) 0xef, /* writeLoop */
-
- MOV_direct_data, P1DIR, (byte) 0x00,
- MOV_direct_data, P1, (byte) 0xFF,
- TRAP,
- };
-
- public byte[] make_flash_page(int flash_addr, int ram_addr, int byte_count) {
- int flash_word_addr = flash_addr >> 1;
- int flash_word_count = ((byte_count + 1) >> 1);
-
- byte[] flash_page = new byte[flash_page_proto.length];
- for (int i = 0; i < flash_page.length; i++)
- flash_page[i] = flash_page_proto[i];
-
- flash_page[FLASH_ADDR_HIGH] = (byte) (flash_word_addr >> 8);
- flash_page[FLASH_ADDR_LOW] = (byte) (flash_word_addr);
- flash_page[RAM_ADDR_HIGH] = (byte) (ram_addr >> 8);
- flash_page[RAM_ADDR_LOW] = (byte) (ram_addr);
-
- byte flash_words_low = (byte) (flash_word_count);
- byte flash_words_high = (byte) (flash_word_count >> 8);
- /* the flashing code has a minor 'bug' */
- if (flash_words_low != 0)
- flash_words_high++;
-
- flash_page[FLASH_WORDS_HIGH] = (byte) flash_words_high;
- flash_page[FLASH_WORDS_LOW] = (byte) flash_words_low;
- return flash_page;
- }
-
- static byte[] set_clkcon_fast = {
- MOV_direct_data, CLKCON, 0x00
- };
-
- static byte[] get_sleep = {
- MOV_A_direct, SLEEP
- };
-
- public void clock_init() throws IOException, InterruptedException {
- if (debug != null) {
- debug.debug_instr(set_clkcon_fast);
-
- byte status;
- for (int times = 0; times < 20; times++) {
- Thread.sleep(1);
- status = debug.debug_instr(get_sleep);
- if ((status & SLEEP_XOSC_STB) != 0)
- return;
- }
- throw new IOException("Failed to initialize target clock");
- }
- }
-
- void action(String in_s, int in_percent) {
- final String s = in_s;
- final int percent = in_percent;
- if (listener != null && !aborted) {
- Runnable r = new Runnable() {
- public void run() {
- try {
- listener.actionPerformed(new ActionEvent(this,
- percent,
- s));
- } catch (Exception ex) {
- }
- }
- };
- SwingUtilities.invokeLater(r);
- }
- }
-
- void action(int part, int total) {
- int percent = 100 * part / total;
- action(String.format("%d/%d (%d%%)",
- part, total, percent),
- percent);
- }
-
- void altos_run(int pc) throws IOException, InterruptedException {
- debug.set_pc(pc);
- int set_pc = debug.get_pc();
- if (pc != set_pc)
- throw new IOException("Failed to set target program counter");
- debug.resume();
-
- for (int times = 0; times < 20; times++) {
- byte status = debug.read_status();
- if ((status & AltosDebug.STATUS_CPU_HALTED) != 0)
- return;
- }
-
- throw new IOException("Failed to execute program on target");
- }
-
- public void flash() {
- try {
- if (!check_rom_config())
- throw new IOException("Invalid rom config settings");
- if (image.address + image.data.length > 0x8000)
- throw new IOException(String.format("Flash image too long %d",
- image.address +
- image.data.length));
- if ((image.address & 0x3ff) != 0)
- throw new IOException(String.format("Flash image must start on page boundary (is 0x%x)",
- image.address));
- int ram_address = 0xf000;
- int flash_prog = 0xf400;
-
- /*
- * Store desired config values into image
- */
- rom_config.write(image);
- /*
- * Bring up the clock
- */
- clock_init();
-
- int remain = image.data.length;
- int flash_addr = image.address;
- int image_start = 0;
-
- action("start", 0);
- action(0, image.data.length);
- while (remain > 0 && !aborted) {
- int this_time = remain;
- if (this_time > 0x400)
- this_time = 0x400;
-
- if (debug != null) {
- /* write the data */
- debug.write_memory(ram_address, image.data,
- image_start, this_time);
-
- /* write the flash program */
- byte[] flash_page = make_flash_page(flash_addr,
- ram_address,
- this_time);
- debug.write_memory(flash_prog, flash_page);
-
- altos_run(flash_prog);
- byte[] check = debug.read_memory(flash_addr, this_time);
- for (int i = 0; i < this_time; i++)
- if (check[i] != image.data[image_start + i])
- throw new IOException(String.format("Flash write failed at 0x%x (%02x != %02x)",
- image.address + image_start + i,
- check[i], image.data[image_start + i]));
- } else {
- Thread.sleep(100);
- }
-
- remain -= this_time;
- flash_addr += this_time;
- image_start += this_time;
-
- action(image.data.length - remain, image.data.length);
- }
- if (!aborted) {
- action("done", 100);
- if (debug != null) {
- debug.set_pc(image.address);
- debug.resume();
- }
- }
- if (debug != null)
- debug.close();
- } catch (IOException ie) {
- action(ie.getMessage(), -1);
- abort();
- } catch (InterruptedException ie) {
- abort();
- }
- }
-
- public void close() {
- if (debug != null)
- debug.close();
- }
-
- synchronized public void abort() {
- aborted = true;
- close();
- }
-
- public void addActionListener(ActionListener l) {
- listener = l;
- }
-
- public boolean check_rom_config() {
- if (debug == null)
- return true;
- if (rom_config == null)
- rom_config = debug.romconfig();
- return rom_config != null && rom_config.valid();
- }
-
- public void set_romconfig (AltosRomconfig romconfig) {
- rom_config = romconfig;
- }
-
- public AltosRomconfig romconfig() {
- if (!check_rom_config())
- return null;
- return rom_config;
- }
-
- public AltosFlash(File in_file, AltosDevice in_debug_dongle)
- throws IOException, FileNotFoundException, AltosSerialInUseException, InterruptedException {
- file = in_file;
- debug_dongle = in_debug_dongle;
- if (debug_dongle != null)
- debug = new AltosDebug(in_debug_dongle);
- input = new FileInputStream(file);
- image = new AltosHexfile(input);
- if (debug != null && !debug.check_connection()) {
- debug.close();
- throw new IOException("Debug port not connected");
- }
- }
-}
\ No newline at end of file
import javax.swing.filechooser.FileNameExtensionFilter;
import java.io.*;
import java.util.concurrent.*;
+import org.altusmetrum.altoslib_1.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosFlashUI
}
}
- class flash_task implements Runnable {
+ class flash_task implements Runnable, AltosFlashListener {
AltosFlashUI ui;
Thread t;
AltosFlash flash;
+ public void position(String in_s, int in_percent) {
+ final String s = in_s;
+ final int percent = in_percent;
+ Runnable r = new Runnable() {
+ public void run() {
+ try {
+ ui.actionPerformed(new ActionEvent(this,
+ percent,
+ s));
+ } catch (Exception ex) {
+ }
+ }
+ };
+ SwingUtilities.invokeLater(r);
+ }
+
public void run () {
try {
- flash = new AltosFlash(ui.file, ui.debug_dongle);
- flash.addActionListener(ui);
+ flash = new AltosFlash(ui.file, new AltosSerial(ui.debug_dongle), this);
final AltosRomconfig current_config = flash.romconfig();
+++ /dev/null
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.io.*;
-import java.util.LinkedList;
-import java.util.Arrays;
-
-class HexFileInputStream extends PushbackInputStream {
- public int line;
-
- public HexFileInputStream(FileInputStream o) {
- super(new BufferedInputStream(o));
- line = 1;
- }
-
- public int read() throws IOException {
- int c = super.read();
- if (c == '\n')
- line++;
- return c;
- }
-
- public void unread(int c) throws IOException {
- if (c == '\n')
- line--;
- if (c != -1)
- super.unread(c);
- }
-}
-
-class HexRecord implements Comparable<Object> {
- public int address;
- public int type;
- public byte checksum;
- public byte[] data;
-
- static final int NORMAL = 0;
- static final int EOF = 1;
- static final int EXTENDED_ADDRESS = 2;
-
- enum read_state {
- marker,
- length,
- address,
- type,
- data,
- checksum,
- newline,
- white,
- done,
- }
-
- boolean ishex(int c) {
- if ('0' <= c && c <= '9')
- return true;
- if ('a' <= c && c <= 'f')
- return true;
- if ('A' <= c && c <= 'F')
- return true;
- return false;
- }
-
- boolean isspace(int c) {
- switch (c) {
- case ' ':
- case '\t':
- return true;
- }
- return false;
- }
-
- int fromhex(int c) {
- if ('0' <= c && c <= '9')
- return c - '0';
- if ('a' <= c && c <= 'f')
- return c - 'a' + 10;
- if ('A' <= c && c <= 'F')
- return c - 'A' + 10;
- return -1;
- }
-
- public byte checksum() {
- byte got = 0;
-
- got += data.length;
- got += (address >> 8) & 0xff;
- got += (address ) & 0xff;
- got += type;
- for (int i = 0; i < data.length; i++)
- got += data[i];
- return (byte) (-got);
- }
-
- public int compareTo(Object other) {
- HexRecord o = (HexRecord) other;
- return address - o.address;
- }
-
- public String toString() {
- return String.format("%04x: %02x (%d)", address, type, data.length);
- }
-
- public HexRecord(HexFileInputStream input) throws IOException {
- read_state state = read_state.marker;
- int nhexbytes = 0;
- int hex = 0;
- int ndata = 0;
- byte got_checksum;
-
- while (state != read_state.done) {
- int c = input.read();
- if (c < 0 && state != read_state.white)
- throw new IOException(String.format("%d: Unexpected EOF", input.line));
- if (c == ' ')
- continue;
- switch (state) {
- case marker:
- if (c != ':')
- throw new IOException("Missing ':'");
- state = read_state.length;
- nhexbytes = 2;
- hex = 0;
- break;
- case length:
- case address:
- case type:
- case data:
- case checksum:
- if(!ishex(c))
- throw new IOException(String.format("Non-hex char '%c'", c));
- hex = hex << 4 | fromhex(c);
- --nhexbytes;
- if (nhexbytes != 0)
- break;
-
- switch (state) {
- case length:
- data = new byte[hex];
- state = read_state.address;
- nhexbytes = 4;
- break;
- case address:
- address = hex;
- state = read_state.type;
- nhexbytes = 2;
- break;
- case type:
- type = hex;
- if (data.length > 0)
- state = read_state.data;
- else
- state = read_state.checksum;
- nhexbytes = 2;
- ndata = 0;
- break;
- case data:
- data[ndata] = (byte) hex;
- ndata++;
- nhexbytes = 2;
- if (ndata == data.length)
- state = read_state.checksum;
- break;
- case checksum:
- checksum = (byte) hex;
- state = read_state.newline;
- break;
- default:
- break;
- }
- hex = 0;
- break;
- case newline:
- if (c != '\n' && c != '\r')
- throw new IOException("Missing newline");
- state = read_state.white;
- break;
- case white:
- if (!isspace(c)) {
- input.unread(c);
- state = read_state.done;
- }
- break;
- case done:
- break;
- }
- }
- got_checksum = checksum();
- if (got_checksum != checksum)
- throw new IOException(String.format("Invalid checksum (read 0x%02x computed 0x%02x)\n",
- checksum, got_checksum));
- }
-}
-
-public class AltosHexfile {
- public int address;
- public byte[] data;
-
- public byte get_byte(int a) {
- return data[a - address];
- }
-
- public AltosHexfile(FileInputStream file) throws IOException {
- HexFileInputStream input = new HexFileInputStream(file);
- LinkedList<HexRecord> record_list = new LinkedList<HexRecord>();
- boolean done = false;
-
- while (!done) {
- HexRecord record = new HexRecord(input);
-
- if (record.type == HexRecord.EOF)
- done = true;
- else
- record_list.add(record);
- }
- HexRecord[] records = record_list.toArray(new HexRecord[0]);
- Arrays.sort(records);
- if (records.length > 0) {
- int base = records[0].address;
- int bound = records[records.length-1].address +
- records[records.length-1].data.length;
-
- data = new byte[bound - base];
- address = base;
- Arrays.fill(data, (byte) 0xff);
-
- /* Paint the records into the new array */
- for (int i = 0; i < records.length; i++) {
- for (int j = 0; j < records[i].data.length; j++)
- data[records[i].address - base + j] = records[i].data[j];
- }
- }
- }
-}
\ No newline at end of file
+++ /dev/null
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.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; version 2 of the License.
- *
- * 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, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-import java.io.*;
-
-public class AltosRomconfig {
- public boolean valid;
- public int version;
- public int check;
- public int serial_number;
- public int radio_calibration;
-
- static int get_int(byte[] bytes, int start, int len) {
- int v = 0;
- int o = 0;
- while (len > 0) {
- v = v | ((((int) bytes[start]) & 0xff) << o);
- start++;
- len--;
- o += 8;
- }
- return v;
- }
-
- static void put_int(int value, byte[] bytes, int start, int len) {
- while (len > 0) {
- bytes[start] = (byte) (value & 0xff);
- start++;
- len--;
- value >>= 8;
- }
- }
-
- static void put_string(String value, byte[] bytes, int start) {
- for (int i = 0; i < value.length(); i++)
- bytes[start + i] = (byte) value.charAt(i);
- }
-
- static final int AO_USB_DESC_STRING = 3;
-
- static void put_usb_serial(int value, byte[] bytes, int start) {
- int offset = start + 0xa;
- int string_num = 0;
-
- while (offset < bytes.length && bytes[offset] != 0) {
- if (bytes[offset + 1] == AO_USB_DESC_STRING) {
- ++string_num;
- if (string_num == 4)
- break;
- }
- offset += ((int) bytes[offset]) & 0xff;
- }
- if (offset >= bytes.length || bytes[offset] == 0)
- return;
- int len = ((((int) bytes[offset]) & 0xff) - 2) / 2;
- String fmt = String.format("%%0%dd", len);
-
- String s = String.format(fmt, value);
- if (s.length() != len) {
- System.out.printf("weird usb length issue %s isn't %d\n",
- s, len);
- return;
- }
- for (int i = 0; i < len; i++) {
- bytes[offset + 2 + i*2] = (byte) s.charAt(i);
- bytes[offset + 2 + i*2+1] = 0;
- }
- }
-
- public AltosRomconfig(byte[] bytes, int offset) {
- version = get_int(bytes, offset + 0, 2);
- check = get_int(bytes, offset + 2, 2);
- if (check == (~version & 0xffff)) {
- switch (version) {
- case 2:
- case 1:
- serial_number = get_int(bytes, offset + 4, 2);
- radio_calibration = get_int(bytes, offset + 6, 4);
- valid = true;
- break;
- }
- }
- }
-
- public AltosRomconfig(AltosHexfile hexfile) {
- this(hexfile.data, 0xa0 - hexfile.address);
- }
-
- public void write(byte[] bytes, int offset) throws IOException {
- if (!valid)
- throw new IOException("rom configuration invalid");
-
- if (offset < 0 || bytes.length < offset + 10)
- throw new IOException("image cannot contain rom config");
-
- AltosRomconfig existing = new AltosRomconfig(bytes, offset);
- if (!existing.valid)
- throw new IOException("image does not contain existing rom config");
-
- switch (existing.version) {
- case 2:
- put_usb_serial(serial_number, bytes, offset);
- case 1:
- put_int(serial_number, bytes, offset + 4, 2);
- put_int(radio_calibration, bytes, offset + 6, 4);
- break;
- }
- }
-
- public void write (AltosHexfile hexfile) throws IOException {
- write(hexfile.data, 0xa0 - hexfile.address);
- AltosRomconfig check = new AltosRomconfig(hexfile);
- if (!check.valid())
- throw new IOException("writing new rom config failed\n");
- }
-
- public AltosRomconfig(int in_serial_number, int in_radio_calibration) {
- valid = true;
- version = 1;
- check = (~version & 0xffff);
- serial_number = in_serial_number;
- radio_calibration = in_radio_calibration;
- }
-
- public boolean valid() {
- return valid && serial_number != 0;
- }
-
- public AltosRomconfig() {
- valid = false;
- }
-}
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
+import org.altusmetrum.altoslib_1.*;
import org.altusmetrum.altosuilib_1.*;
public class AltosRomconfigUI
AltosConfigTDUI.java \
AltosCSV.java \
AltosCSVUI.java \
- AltosDebug.java \
AltosDescent.java \
AltosDeviceUIDialog.java \
AltosDisplayThread.java \
AltosEepromManage.java \
AltosEepromMonitor.java \
AltosEepromSelect.java \
- AltosFlash.java \
AltosFlashUI.java \
AltosFlightDisplay.java \
AltosFlightInfoTableModel.java \
AltosFlightStatusUpdate.java \
AltosFlightUI.java \
AltosFreqList.java \
- AltosHexfile.java \
Altos.java \
AltosIdleMonitorUI.java \
AltosIgniteUI.java \
AltosLights.java \
AltosPad.java \
AltosUIPreferencesBackend.java \
- AltosRomconfig.java \
AltosRomconfigUI.java \
AltosScanUI.java \
AltosSerial.java \
LIBSTLINKDIR=/local/src/stlink
-AM_CFLAGS=$(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS) -I../lib
+AM_CFLAGS=-I$(top_srcdir)/ao-tools/lib $(LIBSTLINK_CFLAGS) $(LIBUSB_CFLAGS)
+AO_STMLOAD_LIBS=$(top_builddir)/ao-tools/lib/libao-tools.a
-ao_stmload_LDADD=$(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+ao_stmload_DEPENDENCIES = $(AO_STMLOAD_LIBS)
-ao_stmload_SOURCES=ao-stmload.c
+ao_stmload_LDADD=$(AO_STMLOAD_LIBS) $(LIBSTLINK_LIBS) $(LIBUSB_LIBS) -lelf
+
+ao_stmload_SOURCES=ao-stmload.c ao-elf.c ao-stmload.h ao-selfload.c
man_MANS = ao-stmload.1
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao-elf.h"
+#include <err.h>
+#include <gelf.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include "ccdbg.h"
+#include "ao-stmload.h"
+
+/*
+ * Look through the Elf file for the AltOS symbols
+ * that can be adjusted before the image is written
+ * to the device
+ */
+static int
+find_symbols (Elf *e)
+{
+ Elf_Scn *scn;
+ Elf_Data *symbol_data = NULL;
+ GElf_Shdr shdr;
+ GElf_Sym sym;
+ int i, symbol_count, s;
+ int required = 0;
+ char *symbol_name;
+ char *section_name;
+ size_t shstrndx;
+
+ if (elf_getshdrstrndx(e, &shstrndx) < 0)
+ return 0;
+
+ /*
+ * Find the symbols
+ */
+
+ scn = NULL;
+ while ((scn = elf_nextscn(e, scn)) != NULL) {
+
+ if (gelf_getshdr(scn, &shdr) != &shdr)
+ return 0;
+
+ if (shdr.sh_type == SHT_SYMTAB) {
+ symbol_data = elf_getdata(scn, NULL);
+ symbol_count = shdr.sh_size / shdr.sh_entsize;
+ break;
+ }
+ }
+
+ if (!symbol_data)
+ return 0;
+
+ for (i = 0; i < symbol_count; i++) {
+ gelf_getsym(symbol_data, i, &sym);
+
+ symbol_name = elf_strptr(e, shdr.sh_link, sym.st_name);
+
+ for (s = 0; s < ao_num_symbols; s++)
+ if (!strcmp (ao_symbols[s].name, symbol_name)) {
+ int t;
+ ao_symbols[s].addr = sym.st_value;
+ if (ao_symbols[s].required)
+ ++required;
+ }
+ }
+
+ return required >= ao_num_required_symbols;
+}
+
+uint32_t round4(uint32_t a) {
+ return (a + 3) & ~3;
+}
+
+struct hex_image *
+new_load (uint32_t addr, uint32_t len)
+{
+ struct hex_image *new;
+
+ len = round4(len);
+ new = calloc (1, sizeof (struct hex_image) + len);
+ if (!new)
+ abort();
+
+ new->address = addr;
+ new->length = len;
+ return new;
+}
+
+void
+load_paste(struct hex_image *into, struct hex_image *from)
+{
+ if (from->address < into->address || into->address + into->length < from->address + from->length)
+ abort();
+
+ memcpy(into->data + from->address - into->address, from->data, from->length);
+}
+
+/*
+ * Make a new load structure large enough to hold the old one and
+ * the new data
+ */
+struct hex_image *
+expand_load(struct hex_image *from, uint32_t address, uint32_t length)
+{
+ struct hex_image *new;
+
+ if (from) {
+ uint32_t from_last = from->address + from->length;
+ uint32_t last = address + length;
+
+ if (address > from->address)
+ address = from->address;
+ if (last < from_last)
+ last = from_last;
+
+ length = last - address;
+
+ if (address == from->address && length == from->length)
+ return from;
+ }
+ new = new_load(address, length);
+ if (from) {
+ load_paste(new, from);
+ free (from);
+ }
+ return new;
+}
+
+/*
+ * Create a new load structure with data from the existing one
+ * and the new data
+ */
+struct hex_image *
+load_write(struct hex_image *from, uint32_t address, uint32_t length, void *data)
+{
+ struct hex_image *new;
+
+ new = expand_load(from, address, length);
+ memcpy(new->data + address - new->address, data, length);
+ return new;
+}
+
+/*
+ * Construct a large in-memory block for all
+ * of the loaded sections of the program
+ */
+static struct hex_image *
+get_load(Elf *e)
+{
+ Elf_Scn *scn;
+ size_t shstrndx;
+ GElf_Shdr shdr;
+ Elf_Data *data;
+ char *got_name;
+ size_t nphdr;
+ size_t p;
+ GElf_Phdr phdr;
+ GElf_Addr p_paddr;
+ GElf_Off p_offset;
+ GElf_Addr sh_paddr;
+ struct hex_image *load = NULL;
+ char *section_name;
+ size_t nshdr;
+ size_t s;
+
+ if (elf_getshdrstrndx(e, &shstrndx) < 0)
+ return 0;
+
+ if (elf_getphdrnum(e, &nphdr) < 0)
+ return 0;
+
+ if (elf_getshdrnum(e, &nshdr) < 0)
+ return 0;
+
+ /*
+ * As far as I can tell, all of the phdr sections should
+ * be flashed to memory
+ */
+ for (p = 0; p < nphdr; p++) {
+
+ /* Find this phdr */
+ gelf_getphdr(e, p, &phdr);
+
+ if (phdr.p_type != PT_LOAD)
+ continue;
+
+ p_offset = phdr.p_offset;
+ /* Get the associated file section */
+
+#if 0
+ printf ("offset %08x vaddr %08x paddr %08x filesz %08x memsz %08x\n",
+ (uint32_t) phdr.p_offset,
+ (uint32_t) phdr.p_vaddr,
+ (uint32_t) phdr.p_paddr,
+ (uint32_t) phdr.p_filesz,
+ (uint32_t) phdr.p_memsz);
+#endif
+
+ for (s = 0; s < nshdr; s++) {
+ scn = elf_getscn(e, s);
+
+ if (!scn) {
+ printf ("getscn failed\n");
+ abort();
+ }
+ if (gelf_getshdr(scn, &shdr) != &shdr) {
+ printf ("gelf_getshdr failed\n");
+ abort();
+ }
+
+ section_name = elf_strptr(e, shstrndx, shdr.sh_name);
+
+ if (phdr.p_offset <= shdr.sh_offset && shdr.sh_offset < phdr.p_offset + phdr.p_filesz) {
+
+ if (shdr.sh_size == 0)
+ continue;
+
+ sh_paddr = phdr.p_paddr + shdr.sh_offset - phdr.p_offset;
+
+ printf ("\tsize %08x rom %08x exec %08x %s\n",
+ (uint32_t) shdr.sh_size,
+ (uint32_t) sh_paddr,
+ (uint32_t) shdr.sh_addr,
+ section_name);
+
+ data = elf_getdata(scn, NULL);
+
+ /* Write the section data into the memory block */
+ load = load_write(load, sh_paddr, shdr.sh_size, data->d_buf);
+ }
+ }
+ }
+ return load;
+}
+
+/*
+ * Open the specified ELF file and
+ * check for the symbols we need
+ */
+
+struct hex_image *
+ao_load_elf(char *name)
+{
+ int fd;
+ Elf *e;
+ Elf_Scn *scn;
+ Elf_Data *symbol_data = NULL;
+ GElf_Shdr shdr;
+ GElf_Sym sym;
+ size_t n, shstrndx, sz;
+ int i, symbol_count, s;
+ int required = 0;
+ struct hex_image *image;
+
+ if (elf_version(EV_CURRENT) == EV_NONE)
+ return NULL;
+
+ fd = open(name, O_RDONLY, 0);
+
+ if (fd < 0)
+ return NULL;
+
+ e = elf_begin(fd, ELF_C_READ, NULL);
+
+ if (!e)
+ return NULL;
+
+ if (elf_kind(e) != ELF_K_ELF)
+ return NULL;
+
+ if (elf_getshdrstrndx(e, &shstrndx) != 0)
+ return NULL;
+
+ if (!find_symbols(e)) {
+ fprintf (stderr, "Cannot find required symbols\n");
+ return NULL;
+ }
+
+ image = get_load(e);
+ if (!image) {
+ fprintf (stderr, "Cannot create memory image from file\n");
+ return NULL;
+ }
+
+ return image;
+}
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_ELF_H_
+#define _AO_ELF_H_
+
+struct hex_image *
+ao_load_elf(char *name);
+
+#endif
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <sysexits.h>
+#include <unistd.h>
+#include <string.h>
+#include "cc.h"
+#include "cc-usb.h"
+#include "ccdbg.h"
+#include "ao-stmload.h"
+
+void
+ao_self_block_read(struct cc_usb *cc, uint32_t address, uint8_t block[256])
+{
+ int byte;
+ cc_usb_sync(cc);
+ cc_usb_printf(cc, "R %x\n", address);
+// printf ("read %08x\n", address);
+ for (byte = 0; byte < 0x100; byte++) {
+ block[byte] = cc_usb_getchar(cc);
+// printf (" %02x", block[byte]);
+// if ((byte & 0xf) == 0xf)
+// printf ("\n");
+ }
+}
+
+void
+ao_self_block_write(struct cc_usb *cc, uint32_t address, uint8_t block[256])
+{
+ int byte;
+ cc_usb_sync(cc);
+ cc_usb_printf(cc, "W %x\n", address);
+// printf ("write %08x\n", address);
+ for (byte = 0; byte < 0x100; byte++) {
+ cc_usb_printf(cc, "%c", block[byte]);
+// printf (" %02x", block[byte]);
+// if ((byte & 0xf) == 0xf)
+// printf ("\n");
+ }
+}
+
+struct hex_image *
+ao_self_read(struct cc_usb *cc, uint32_t address, uint32_t length)
+{
+ struct hex_image *image;
+ int pages;
+ int page;
+ uint32_t base = address & ~0xff;
+ uint32_t bound = (address + length + 0xff) & ~0xff;
+
+ image = calloc(sizeof (struct hex_image) + (bound - base), 1);
+ image->address = base;
+ image->length = bound - base;
+ pages = image->length / 0x100;
+ for (page = 0; page < pages; page++)
+ ao_self_block_read(cc, image->address + page * 0x100, image->data + page * 0x100);
+ return image;
+}
+
+int
+ao_self_write(struct cc_usb *cc, struct hex_image *image)
+{
+ uint8_t block[256];
+ uint8_t check[256];
+ uint32_t base, bound, length, address;
+ uint32_t pages;
+ uint32_t page;
+
+ base = image->address & ~0xff;
+ bound = (image->address + image->length + 0xff) & ~0xff;
+
+ address = base;
+ length = bound - base;
+
+ pages = length / 0x100;
+ printf ("Write %08x %d pages: ", address, length/0x100); fflush(stdout);
+ for (page = 0; page < pages; page++) {
+ uint32_t start, stop;
+ address = base + page * 0x100;
+
+ if (address < image->address || address + 0x100 > image->address + image->length) {
+ ao_self_block_read(cc, address, block);
+ }
+ start = address;
+ stop = address + 0x100;
+ if (start < image->address)
+ start = image->address;
+ if (stop > image->address + image->length)
+ stop = image->address + image->length;
+ memcpy(block + start - address, image->data + start - image->address, stop - start);
+ ao_self_block_write(cc, address, block);
+ ao_self_block_read(cc, address, check);
+ if (memcmp(block, check, 0x100) != 0) {
+ fprintf(stderr, "Block at 0x%08x doesn't match\n", address);
+ return 0;
+ }
+ putchar('.'); fflush(stdout);
+ }
+ printf("done\n");
+ return 1;
+}
#include <getopt.h>
#include <string.h>
#include "stlink-common.h"
+#include "ao-elf.h"
+#include "ccdbg.h"
+#include "cc-usb.h"
+#include "cc.h"
+#include "ao-stmload.h"
#define AO_USB_DESC_STRING 3
-struct sym {
- unsigned addr;
- char *name;
- int required;
-} ao_symbols[] = {
+struct sym ao_symbols[] = {
- { 0, "ao_romconfig_version", 1 },
+ { 0, 0x08002100, "ao_romconfig_version", 1 },
#define AO_ROMCONFIG_VERSION (ao_symbols[0].addr)
- { 0, "ao_romconfig_check", 1 },
+ { 0, 0x08002102, "ao_romconfig_check", 1 },
#define AO_ROMCONFIG_CHECK (ao_symbols[1].addr)
- { 0, "ao_serial_number", 1 },
+ { 0, 0x08002104, "ao_serial_number", 1 },
#define AO_SERIAL_NUMBER (ao_symbols[2].addr)
- { 0, "ao_usb_descriptors", 0 },
-#define AO_USB_DESCRIPTORS (ao_symbols[3].addr)
+ { 0, 0x08002108, "ao_radio_cal", 0 },
+#define AO_RADIO_CAL (ao_symbols[3].addr)
- { 0, "ao_radio_cal", 0 },
-#define AO_RADIO_CAL (ao_symbols[4].addr)
+ { 0, 0x0800210c, "ao_usb_descriptors", 0 },
+#define AO_USB_DESCRIPTORS (ao_symbols[4].addr)
};
#define NUM_SYMBOLS 5
#define NUM_REQUIRED_SYMBOLS 3
-/*
- * Look through the Elf file for the AltOS symbols
- * that can be adjusted before the image is written
- * to the device
- */
-static int
-find_symbols (Elf *e)
-{
- Elf_Scn *scn;
- Elf_Data *symbol_data = NULL;
- GElf_Shdr shdr;
- GElf_Sym sym;
- int i, symbol_count, s;
- int required = 0;
- char *symbol_name;
- char *section_name;
- size_t shstrndx;
-
- if (elf_getshdrstrndx(e, &shstrndx) < 0)
- return 0;
-
- /*
- * Find the symbols
- */
-
- scn = NULL;
- while ((scn = elf_nextscn(e, scn)) != NULL) {
-
- if (gelf_getshdr(scn, &shdr) != &shdr)
- return 0;
-
-#if 0
- section_name = elf_strptr(e, shstrndx, shdr.sh_name);
-
- printf ("name %s\n", section_name);
-
- if (shdr.sh_type == SHT_PROGBITS)
- {
- printf ("\ttype %lx\n", shdr.sh_type);
- printf ("\tflags %lx\n", shdr.sh_flags);
- printf ("\taddr %lx\n", shdr.sh_addr);
- printf ("\toffset %lx\n", shdr.sh_offset);
- printf ("\tsize %lx\n", shdr.sh_size);
- printf ("\tlink %lx\n", shdr.sh_link);
- printf ("\tinfo %lx\n", shdr.sh_info);
- printf ("\taddralign %lx\n", shdr.sh_addralign);
- printf ("\tentsize %lx\n", shdr.sh_entsize);
- }
-#endif
-
- if (shdr.sh_type == SHT_SYMTAB) {
- symbol_data = elf_getdata(scn, NULL);
- symbol_count = shdr.sh_size / shdr.sh_entsize;
- break;
- }
- }
-
- if (!symbol_data)
- return 0;
-
- for (i = 0; i < symbol_count; i++) {
- gelf_getsym(symbol_data, i, &sym);
-
- symbol_name = elf_strptr(e, shdr.sh_link, sym.st_name);
-
- for (s = 0; s < NUM_SYMBOLS; s++)
- if (!strcmp (ao_symbols[s].name, symbol_name)) {
- int t;
- ao_symbols[s].addr = sym.st_value;
- if (ao_symbols[s].required)
- ++required;
- }
- }
-
- return required >= NUM_REQUIRED_SYMBOLS;
-}
-
-struct load {
- uint32_t addr;
- uint32_t len;
- uint8_t buf[0];
-};
-
-uint32_t round4(uint32_t a) {
- return (a + 3) & ~3;
-}
-
-struct load *
-new_load (uint32_t addr, uint32_t len)
-{
- struct load *new;
-
- len = round4(len);
- new = calloc (1, sizeof (struct load) + len);
- if (!new)
- abort();
-
- new->addr = addr;
- new->len = len;
- return new;
-}
-
-void
-load_paste(struct load *into, struct load *from)
-{
- if (from->addr < into->addr || into->addr + into->len < from->addr + from->len)
- abort();
-
- memcpy(into->buf + from->addr - into->addr, from->buf, from->len);
-}
-
-/*
- * Make a new load structure large enough to hold the old one and
- * the new data
- */
-struct load *
-expand_load(struct load *from, uint32_t addr, uint32_t len)
-{
- struct load *new;
-
- if (from) {
- uint32_t from_last = from->addr + from->len;
- uint32_t last = addr + len;
-
- if (addr > from->addr)
- addr = from->addr;
- if (last < from_last)
- last = from_last;
-
- len = last - addr;
-
- if (addr == from->addr && len == from->len)
- return from;
- }
- new = new_load(addr, len);
- if (from) {
- load_paste(new, from);
- free (from);
- }
- return new;
-}
-
-/*
- * Create a new load structure with data from the existing one
- * and the new data
- */
-struct load *
-load_write(struct load *from, uint32_t addr, uint32_t len, void *data)
-{
- struct load *new;
-
- new = expand_load(from, addr, len);
- memcpy(new->buf + addr - new->addr, data, len);
- return new;
-}
-
-/*
- * Construct a large in-memory block for all
- * of the loaded sections of the program
- */
-static struct load *
-get_load(Elf *e)
-{
- Elf_Scn *scn;
- size_t shstrndx;
- GElf_Shdr shdr;
- Elf_Data *data;
- uint8_t *buf;
- char *got_name;
- size_t nphdr;
- size_t p;
- GElf_Phdr phdr;
- GElf_Addr p_paddr;
- GElf_Off p_offset;
- GElf_Addr sh_paddr;
- struct load *load = NULL;
- char *section_name;
- size_t nshdr;
- size_t s;
-
- if (elf_getshdrstrndx(e, &shstrndx) < 0)
- return 0;
-
- if (elf_getphdrnum(e, &nphdr) < 0)
- return 0;
-
- if (elf_getshdrnum(e, &nshdr) < 0)
- return 0;
-
- /*
- * As far as I can tell, all of the phdr sections should
- * be flashed to memory
- */
- for (p = 0; p < nphdr; p++) {
-
- /* Find this phdr */
- gelf_getphdr(e, p, &phdr);
-
- if (phdr.p_type != PT_LOAD)
- continue;
-
- p_offset = phdr.p_offset;
- /* Get the associated file section */
-
-#if 0
- printf ("offset %08x vaddr %08x paddr %08x filesz %08x memsz %08x\n",
- (uint32_t) phdr.p_offset,
- (uint32_t) phdr.p_vaddr,
- (uint32_t) phdr.p_paddr,
- (uint32_t) phdr.p_filesz,
- (uint32_t) phdr.p_memsz);
-#endif
-
- for (s = 0; s < nshdr; s++) {
- scn = elf_getscn(e, s);
-
- if (!scn) {
- printf ("getscn failed\n");
- abort();
- }
- if (gelf_getshdr(scn, &shdr) != &shdr) {
- printf ("gelf_getshdr failed\n");
- abort();
- }
-
- section_name = elf_strptr(e, shstrndx, shdr.sh_name);
-
- if (phdr.p_offset <= shdr.sh_offset && shdr.sh_offset < phdr.p_offset + phdr.p_filesz) {
-
- if (shdr.sh_size == 0)
- continue;
-
- sh_paddr = phdr.p_paddr + shdr.sh_offset - phdr.p_offset;
-
- printf ("\tsize %08x rom %08x exec %08x %s\n",
- (uint32_t) shdr.sh_size,
- (uint32_t) sh_paddr,
- (uint32_t) shdr.sh_addr,
- section_name);
-
- data = elf_getdata(scn, NULL);
-
- /* Write the section data into the memory block */
- load = load_write(load, sh_paddr, shdr.sh_size, data->d_buf);
- }
- }
- }
- return load;
-}
+int ao_num_symbols = NUM_SYMBOLS;
+int ao_num_required_symbols = NUM_REQUIRED_SYMBOLS;
/*
* Edit the to-be-written memory block
*/
static int
-rewrite(struct load *load, unsigned addr, uint8_t *data, int len)
+rewrite(struct hex_image *load, unsigned address, uint8_t *data, int length)
{
int i;
- if (addr < load->addr || load->addr + load->len < addr + len)
+ if (address < load->address || load->address + load->length < address + length)
return 0;
- printf("rewrite %04x:", addr);
- for (i = 0; i < len; i++)
- printf (" %02x", load->buf[addr - load->addr + i]);
+ printf("rewrite %04x:", address);
+ for (i = 0; i < length; i++)
+ printf (" %02x", load->data[address - load->address + i]);
printf(" ->");
- for (i = 0; i < len; i++)
+ for (i = 0; i < length; i++)
printf (" %02x", data[i]);
printf("\n");
- memcpy(load->buf + addr - load->addr, data, len);
+ memcpy(load->data + address - load->address, data, length);
}
/*
- * Open the specified ELF file and
- * check for the symbols we need
+ * Read a 16-bit value from the USB target
*/
-Elf *
-ao_open_elf(char *name)
+static uint16_t
+get_uint16_cc(struct cc_usb *cc, uint32_t addr)
{
- int fd;
- Elf *e;
- Elf_Scn *scn;
- Elf_Data *symbol_data = NULL;
- GElf_Shdr shdr;
- GElf_Sym sym;
- size_t n, shstrndx, sz;
- int i, symbol_count, s;
- int required = 0;
-
- if (elf_version(EV_CURRENT) == EV_NONE)
- return NULL;
+ struct hex_image *hex = ao_self_read(cc, addr, 2);
+ uint16_t v;
+ uint8_t *data;
- fd = open(name, O_RDONLY, 0);
-
- if (fd < 0)
- return NULL;
-
- e = elf_begin(fd, ELF_C_READ, NULL);
-
- if (!e)
- return NULL;
-
- if (elf_kind(e) != ELF_K_ELF)
- return NULL;
-
- if (elf_getshdrstrndx(e, &shstrndx) != 0)
- return NULL;
+ if (!hex)
+ return 0;
+ data = hex->data + addr - hex->address;
+ v = data[0] | (data[1] << 8);
+ free(hex);
+ return v;
+}
- if (!find_symbols(e)) {
- fprintf (stderr, "Cannot find required symbols\n");
- return NULL;
- }
+static uint32_t
+get_uint32_cc(struct cc_usb *cc, uint32_t addr)
+{
+ struct hex_image *hex = ao_self_read(cc, addr, 4);
+ uint32_t v;
+ uint8_t *data;
- return e;
+ if (!hex)
+ return 0;
+ data = hex->data + addr - hex->address;
+ v = data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+ free(hex);
+ return v;
}
/*
- * Read a 32-bit value from the target device with arbitrary
+ * Read a 16-bit value from the target device with arbitrary
* alignment
*/
-static uint32_t
-get_uint32(stlink_t *sl, uint32_t addr)
+static uint16_t
+get_uint16_sl(stlink_t *sl, uint32_t addr)
{
const uint8_t *data = sl->q_buf;
uint32_t actual_addr;
int off;
- uint32_t result;
+ uint16_t result;
sl->q_len = 0;
- printf ("read 0x%x\n", addr);
actual_addr = addr & ~3;
abort();
off = addr & 3;
- result = data[off] | (data[off + 1] << 8) | (data[off+2] << 16) | (data[off+3] << 24);
- printf ("read 0x%08x = 0x%08x\n", addr, result);
+ result = data[off] | (data[off + 1] << 8);
+ return result;
+}
+
+static uint16_t
+get_uint16(stlink_t *sl, struct cc_usb *cc, uint32_t addr)
+{
+ uint16_t result;
+ if (cc)
+ result = get_uint16_cc(cc, addr);
+ else
+ result = get_uint16_sl(sl, addr);
+ printf ("read 0x%08x = 0x%04x\n", addr, result);
return result;
}
/*
- * Read a 16-bit value from the target device with arbitrary
+ * Read a 32-bit value from the target device with arbitrary
* alignment
*/
-static uint16_t
-get_uint16(stlink_t *sl, uint32_t addr)
+static uint32_t
+get_uint32_sl(stlink_t *sl, uint32_t addr)
{
const uint8_t *data = sl->q_buf;
uint32_t actual_addr;
int off;
- uint16_t result;
+ uint32_t result;
sl->q_len = 0;
+ printf ("read 0x%x\n", addr);
actual_addr = addr & ~3;
abort();
off = addr & 3;
- result = data[off] | (data[off + 1] << 8);
- printf ("read 0x%08x = 0x%04x\n", addr, result);
+ result = data[off] | (data[off + 1] << 8) | (data[off+2] << 16) | (data[off+3] << 24);
+ return result;
+}
+
+/*
+ * Read a 32-bit value from the target device with arbitrary
+ * alignment
+ */
+static uint32_t
+get_uint32(stlink_t *sl, struct cc_usb *cc, uint32_t addr)
+{
+ uint32_t result;
+
+ if (cc)
+ result = get_uint32_cc(cc, addr);
+ else
+ result = get_uint32_sl(sl, addr);
+ printf ("read 0x%08x = 0x%08x\n", addr, result);
return result;
}
* places this at 0x100 from the start of the rom section
*/
static int
-check_flashed(stlink_t *sl)
+check_flashed(stlink_t *sl, struct cc_usb *cc)
{
- uint16_t romconfig_version = get_uint16(sl, AO_ROMCONFIG_VERSION);
- uint16_t romconfig_check = get_uint16(sl, AO_ROMCONFIG_CHECK);
+ uint16_t romconfig_version = get_uint16(sl, cc, AO_ROMCONFIG_VERSION);
+ uint16_t romconfig_check = get_uint16(sl, cc, AO_ROMCONFIG_CHECK);
if (romconfig_version != (uint16_t) ~romconfig_check) {
fprintf (stderr, "Device has not been flashed before\n");
}
static const struct option options[] = {
+ { .name = "stlink", .has_arg = 0, .val = 'S' },
+ { .name = "tty", .has_arg = 1, .val = 'T' },
{ .name = "device", .has_arg = 1, .val = 'D' },
{ .name = "cal", .has_arg = 1, .val = 'c' },
{ .name = "serial", .has_arg = 1, .val = 's' },
static void usage(char *program)
{
- fprintf(stderr, "usage: %s [--cal=<radio-cal>] [--serial=<serial>] file.elf\n", program);
+ fprintf(stderr, "usage: %s [--stlink] [--device=<device>] [-tty=<tty>] [--cal=<radio-cal>] [--serial=<serial>] file.{elf,ihx}\n", program);
exit(1);
}
void
-done(stlink_t *sl, int code)
+done(stlink_t *sl, struct cc_usb *cc, int code)
{
+ if (cc) {
+/* cc_usb_printf(cc, "a\n"); */
+ cc_usb_close(cc);
+ }
if (sl) {
stlink_reset(sl);
stlink_run(sl);
exit (code);
}
+static int
+ends_with(char *whole, char *suffix)
+{
+ int whole_len = strlen(whole);
+ int suffix_len = strlen(suffix);
+
+ if (suffix_len > whole_len)
+ return 0;
+ return strcmp(whole + whole_len - suffix_len, suffix) == 0;
+}
+
int
main (int argc, char **argv)
{
char cal_int[4];
char *cal_end;
int c;
- stlink_t *sl;
+ stlink_t *sl = NULL;
int was_flashed = 0;
- struct load *load;
+ struct hex_image *load;
int tries;
+ struct cc_usb *cc = NULL;
+ int use_stlink = 0;
+ char *tty = NULL;
+ int success;
- while ((c = getopt_long(argc, argv, "D:c:s:", options, NULL)) != -1) {
+ while ((c = getopt_long(argc, argv, "T:D:c:s:S", options, NULL)) != -1) {
switch (c) {
+ case 'T':
+ tty = optarg;
+ break;
case 'D':
device = optarg;
break;
if (serial_end == optarg || *serial_end != '\0')
usage(argv[0]);
break;
+ case 'S':
+ use_stlink = 1;
+ break;
default:
usage(argv[0]);
break;
if (filename == NULL)
usage(argv[0]);
- /*
- * Open the source file and load the symbols and
- * flash data
- */
-
- e = ao_open_elf(filename);
- if (!e) {
- fprintf(stderr, "Cannot open file \"%s\"\n", filename);
- exit(1);
- }
-
- if (!find_symbols(e)) {
- fprintf(stderr, "Cannot find symbols in \"%s\"\n", filename);
- exit(1);
- }
+ if (ends_with (filename, ".elf")) {
+ load = ao_load_elf(filename);
+ } else if (ends_with (filename, ".ihx")) {
+ int i;
+ load = ccdbg_hex_load(filename);
+ for (i = 0; i < ao_num_symbols; i++)
+ ao_symbols[i].addr = ao_symbols[i].default_addr;
+ } else
+ usage(argv[0]);
- if (!(load = get_load(e))) {
- fprintf(stderr, "Cannot find program data in \"%s\"\n", filename);
- exit(1);
- }
-
- /* Connect to the programming dongle
- */
+ if (use_stlink) {
+ /* Connect to the programming dongle
+ */
- for (tries = 0; tries < 3; tries++) {
- if (device) {
- sl = stlink_v1_open(50);
- } else {
- sl = stlink_open_usb(50);
+ for (tries = 0; tries < 3; tries++) {
+ if (device) {
+ sl = stlink_v1_open(50);
+ } else {
+ sl = stlink_open_usb(50);
+ }
+ if (!sl) {
+ fprintf (stderr, "No STLink devices present\n");
+ done (sl, NULL, 1);
+ }
+
+ if (sl->chip_id != 0)
+ break;
+ stlink_reset(sl);
+ stlink_close(sl);
+ sl = NULL;
}
if (!sl) {
- fprintf (stderr, "No STLink devices present\n");
- done (sl, 1);
+ fprintf (stderr, "Debugger connection failed\n");
+ exit(1);
}
- if (sl->chip_id != 0)
- break;
- stlink_reset(sl);
- stlink_close(sl);
- }
- if (sl->chip_id == 0) {
- fprintf (stderr, "Debugger connection failed\n");
- done(sl, 1);
- }
+ /* Verify that the loaded image fits entirely within device flash
+ */
+ if (load->address < sl->flash_base ||
+ sl->flash_base + sl->flash_size < load->address + load->length) {
+ fprintf (stderr, "\%s\": Invalid memory range 0x%08x - 0x%08x\n", filename,
+ load->address, load->address + load->length);
+ done(sl, NULL, 1);
+ }
- /* Verify that the loaded image fits entirely within device flash
- */
- if (load->addr < sl->flash_base ||
- sl->flash_base + sl->flash_size < load->addr + load->len) {
- fprintf (stderr, "\%s\": Invalid memory range 0x%08x - 0x%08x\n", filename,
- load->addr, load->addr + load->len);
- done(sl, 1);
+ /* Enter debugging mode
+ */
+ if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
+ stlink_exit_dfu_mode(sl);
+
+ if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
+ stlink_enter_swd_mode(sl);
+ } else {
+ int is_loader;
+ int tries;
+
+ for (tries = 0; tries < 3; tries++) {
+ char *this_tty = tty;
+ if (!this_tty)
+ this_tty = cc_usbdevs_find_by_arg(device, "AltosFlash");
+ if (!this_tty)
+ this_tty = cc_usbdevs_find_by_arg(device, "MegaMetrum");
+ if (!this_tty)
+ this_tty = getenv("ALTOS_TTY");
+ if (!this_tty)
+ this_tty="/dev/ttyACM0";
+
+ cc = cc_usb_open(this_tty);
+
+ if (!cc)
+ exit(1);
+ cc_usb_printf(cc, "v\n");
+ is_loader = 0;
+ for (;;) {
+ char line[256];
+ cc_usb_getline(cc, line, sizeof(line));
+ if (!strncmp(line, "altos-loader", 12))
+ is_loader = 1;
+ if (!strncmp(line, "software-version", 16))
+ break;
+ }
+ if (is_loader)
+ break;
+ printf ("rebooting to loader\n");
+ cc_usb_printf(cc, "L\n");
+ cc_usb_close(cc);
+ sleep(1);
+ cc = NULL;
+ }
+ if (!is_loader) {
+ fprintf(stderr, "Cannot switch to boot loader\n");
+ exit(1);
+ }
+ {
+ uint8_t check[256];
+ int i = 0;
+
+ ao_self_block_read(cc, 0x08002000, check);
+ for (;;) {
+ uint8_t block[256];
+ putchar ('.');
+ if (++i == 40) {
+ putchar('\n');
+ i = 0;
+ }
+ fflush(stdout);
+ ao_self_block_write(cc, 0x08002000, block);
+ ao_self_block_read(cc, 0x08002000, block);
+ if (memcmp(block, check, 256) != 0) {
+ fprintf (stderr, "read differed\n");
+ exit(1);
+ }
+ }
+ }
}
- /* Enter debugging mode
- */
- if (stlink_current_mode(sl) == STLINK_DEV_DFU_MODE)
- stlink_exit_dfu_mode(sl);
-
- if (stlink_current_mode(sl) != STLINK_DEV_DEBUG_MODE)
- stlink_enter_swd_mode(sl);
-
/* Go fetch existing config values
* if available
*/
- was_flashed = check_flashed(sl);
+ was_flashed = check_flashed(sl, cc);
if (!serial) {
if (!was_flashed) {
fprintf (stderr, "Must provide serial number\n");
- done(sl, 1);
+ done(sl, cc, 1);
}
- serial = get_uint16(sl, AO_SERIAL_NUMBER);
+ serial = get_uint16(sl, cc, AO_SERIAL_NUMBER);
if (!serial || serial == 0xffff) {
fprintf (stderr, "Invalid existing serial %d\n", serial);
- done(sl, 1);
+ done(sl, cc, 1);
}
}
if (!cal && AO_RADIO_CAL && was_flashed) {
- cal = get_uint32(sl, AO_RADIO_CAL);
+ cal = get_uint32(sl, cc, AO_RADIO_CAL);
if (!cal || cal == 0xffffffff) {
fprintf (stderr, "Invalid existing rf cal %d\n", cal);
- done(sl, 1);
+ done(sl, cc, 1);
}
}
if (!rewrite(load, AO_SERIAL_NUMBER, serial_int, sizeof (serial_int))) {
fprintf(stderr, "Cannot rewrite serial integer at %08x\n",
AO_SERIAL_NUMBER);
- done(sl, 1);
+ done(sl, cc, 1);
}
if (AO_USB_DESCRIPTORS) {
- unsigned usb_descriptors;
- usb_descriptors = AO_USB_DESCRIPTORS - load->addr;
+ uint32_t usb_descriptors = AO_USB_DESCRIPTORS - load->address;
string_num = 0;
- while (load->buf[usb_descriptors] != 0 && usb_descriptors < load->len) {
- if (load->buf[usb_descriptors+1] == AO_USB_DESC_STRING) {
+ while (load->data[usb_descriptors] != 0 && usb_descriptors < load->length) {
+ if (load->data[usb_descriptors+1] == AO_USB_DESC_STRING) {
++string_num;
if (string_num == 4)
break;
}
- usb_descriptors += load->buf[usb_descriptors];
+ usb_descriptors += load->data[usb_descriptors];
}
- if (usb_descriptors >= load->len || load->buf[usb_descriptors] == 0 ) {
+ if (usb_descriptors >= load->length || load->data[usb_descriptors] == 0 ) {
fprintf(stderr, "Cannot rewrite serial string at %08x\n", AO_USB_DESCRIPTORS);
- done(sl, 1);
+ done(sl, cc, 1);
}
- serial_ucs2_len = load->buf[usb_descriptors] - 2;
+ serial_ucs2_len = load->data[usb_descriptors] - 2;
serial_ucs2 = malloc(serial_ucs2_len);
if (!serial_ucs2) {
fprintf(stderr, "Malloc(%d) failed\n", serial_ucs2_len);
- done(sl, 1);
+ done(sl, cc, 1);
}
s = serial;
for (i = serial_ucs2_len / 2; i; i--) {
serial_ucs2[i * 2 - 2] = (s % 10) + '0';
s /= 10;
}
- if (!rewrite(load, usb_descriptors + 2 + load->addr, serial_ucs2, serial_ucs2_len)) {
+ if (!rewrite(load, usb_descriptors + 2 + load->address, serial_ucs2, serial_ucs2_len)) {
fprintf (stderr, "Cannot rewrite USB descriptor at %08x\n", AO_USB_DESCRIPTORS);
- done(sl, 1);
+ done(sl, cc, 1);
}
}
/* And flash the resulting image to the device
*/
- if (stlink_write_flash(sl, load->addr, load->buf, load->len) < 0) {
+ if (cc)
+ success = ao_self_write(cc, load);
+ else
+ success = (stlink_write_flash(sl, load->address, load->data, load->length) >= 0);
+
+ if (!success) {
fprintf (stderr, "\"%s\": Write failed\n", filename);
- done(sl, 1);
+ done(sl, cc, 1);
}
- done(sl, 0);
+ done(sl, cc, 0);
}
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_STMLOAD_H_
+#define _AO_STMLOAD_H_
+
+struct sym {
+ unsigned addr;
+ unsigned default_addr;
+ char *name;
+ int required;
+};
+
+extern struct sym ao_symbols[];
+
+extern int ao_num_symbols;
+extern int ao_num_required_symbols;
+
+void
+ao_self_block_read(struct cc_usb *cc, uint32_t address, uint8_t block[256]);
+
+void
+ao_self_block_write(struct cc_usb *cc, uint32_t address, uint8_t block[256]);
+
+struct hex_image *
+ao_self_read(struct cc_usb *cc, uint32_t address, uint32_t length);
+
+int
+ao_self_write(struct cc_usb *cc, struct hex_image *image);
+
+#endif /* _AO_STMLOAD_H_ */
case '\n':
eol = 1;
default:
- ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
+ if (c < ' ' || c > '~')
+ ccdbg_debug(CC_DEBUG_BITBANG, "\\%02x", c);
+ else
+ ccdbg_debug(CC_DEBUG_BITBANG, "%c", c);
}
}
}
ret = read(cc->fd, cc->in_buf + cc->in_count,
CC_IN_BUF - cc->in_count);
if (ret > 0) {
+ int i;
cc_usb_dbg(24, cc->in_buf + cc->in_count, ret);
cc->in_count += ret;
if (cc->hex_count)
free(hex);
}
-static int
-ccdbg_hex_record_compar(const void *av, const void *bv)
-{
- const struct hex_record *a = *(struct hex_record **) av;
- const struct hex_record *b = *(struct hex_record **) bv;
-
- return (int) a->address - (int) b->address;
-}
-
struct hex_file *
ccdbg_hex_file_read(FILE *file, char *name)
{
if (record->type == HEX_RECORD_EOF)
done = 1;
}
- /*
- * Sort them into increasing addresses, except for EOF
- */
- qsort(hex->records, hex->nrecord - 1, sizeof (struct hex_record *),
- ccdbg_hex_record_compar);
return hex;
bail:
ccdbg_hex_image_create(struct hex_file *hex)
{
struct hex_image *image;
- struct hex_record *first, *last, *record;
+ struct hex_record *record;
int i;
+ uint32_t addr;
uint32_t base, bound;
uint32_t offset;
+ uint32_t extended_addr;
+
int length;
- first = hex->records[0];
- last = hex->records[hex->nrecord - 2]; /* skip EOF */
- base = (uint32_t) first->address;
- bound = (uint32_t) last->address + (uint32_t) last->length;
+ base = 0xffffffff;
+ bound = 0x0;
+ extended_addr = 0;
+ for (i = 0; i < hex->nrecord; i++) {
+ uint32_t r_bound;
+ record = hex->records[i];
+ switch (record->type) {
+ case 0:
+ addr = extended_addr + record->address;
+ r_bound = addr + record->length;
+ if (addr < base)
+ base = addr;
+ if (r_bound > bound)
+ bound = r_bound;
+ break;
+ case 1:
+ break;
+ case 2:
+ if (record->length != 2)
+ return NULL;
+ extended_addr = ((record->data[0] << 8) | record->data[1]) << 4;
+ break;
+ case 4:
+ if (record->length != 2)
+ return NULL;
+ extended_addr = ((record->data[0] << 8) | record->data[1]) << 16;
+ break;
+ }
+
+ }
length = bound - base;
image = calloc(sizeof(struct hex_image) + length, 1);
if (!image)
image->address = base;
image->length = length;
memset(image->data, 0xff, length);
- for (i = 0; i < hex->nrecord - 1; i++) {
+ extended_addr = 0;
+ for (i = 0; i < hex->nrecord; i++) {
record = hex->records[i];
- offset = record->address - base;
- memcpy(image->data + offset, record->data, record->length);
+ switch (record->type) {
+ case 0:
+ addr = extended_addr + record->address;
+ offset = addr - base;
+ memcpy(image->data + offset, record->data, record->length);
+ break;
+ case 1:
+ break;
+ case 2:
+ extended_addr = ((record->data[0] << 8) | record->data[1]) << 4;
+ break;
+ case 4:
+ extended_addr = ((record->data[0] << 8) | record->data[1]) << 16;
+ break;
+ }
}
return image;
}
return 0;
return 1;
}
+
+struct hex_image *
+ccdbg_hex_load(char *filename)
+{
+ FILE *file;
+ struct hex_file *hex_file;
+ struct hex_image *hex_image;
+
+ file = fopen (filename, "r");
+ if (!file)
+ return 0;
+
+ hex_file = ccdbg_hex_file_read(file, filename);
+ fclose(file);
+ if (!hex_file)
+ return 0;
+ hex_image = ccdbg_hex_image_create(hex_file);
+ if (!hex_image)
+ return 0;
+ ccdbg_hex_file_free(hex_file);
+ return hex_image;
+}
};
struct hex_image {
- uint16_t address;
- uint16_t length;
+ uint32_t address;
+ uint32_t length;
uint8_t data[0];
};
void
ccdbg_hex_image_free(struct hex_image *image);
+struct hex_image *
+ccdbg_hex_load(char *filename);
+
int
ccdbg_hex_image_equal(struct hex_image *a, struct hex_image *b);
{
ao_clock_init();
+ ao_task_init();
+
ao_serial_init();
ao_led_init(LEDS_AVAILABLE);
extern __pdata char ao_cmd_lex_c;
extern __pdata enum ao_cmd_status ao_cmd_status;
+void
+ao_put_string(__code char *s);
+
void
ao_cmd_lex(void);
*/
#include "ao.h"
+#include "ao_task.h"
__pdata uint16_t ao_cmd_lex_i;
__pdata uint32_t ao_cmd_lex_u32;
static __pdata uint8_t cmd_len;
static __pdata uint8_t cmd_i;
-static void
-put_string(__code char *s)
+void
+ao_put_string(__code char *s)
{
char c;
while ((c = *s++))
static void
backspace(void)
{
- put_string ("\010 \010");
+ ao_put_string ("\010 \010");
}
static void
{
char c;
if (ao_echo())
- put_string("> ");
+ ao_put_string("> ");
cmd_len = 0;
for (;;) {
flush();
ao_panic(AO_PANIC_REBOOT);
}
+#ifndef HAS_VERSION
+#define HAS_VERSION 1
+#endif
+
+#if HAS_VERSION
static void
version(void)
{
#endif
printf("software-version %s\n", ao_version);
}
+#endif
#ifndef NUM_CMDS
#define NUM_CMDS 11
__pdata uint8_t cmds;
__pdata uint8_t cmd;
__code struct ao_cmds * __pdata cs;
- const char *h;
+ __code char *h;
+ uint8_t e;
for (cmds = 0; cmds < ao_ncmds; cmds++) {
cs = ao_cmds[cmds];
for (cmd = 0; cs[cmd].func; cmd++) {
h = cs[cmd].help;
- printf("%-45s %s\n", h, h + 1 + strlen(h));
+ ao_put_string(h);
+ e = strlen(h);
+ h += e + 1;
+ e = 45 - e;
+ while (e--)
+ putchar(' ');
+ ao_put_string(h);
+ putchar('\n');
}
}
}
__code struct ao_cmds ao_base_cmds[] = {
{ help, "?\0Help" },
+#if HAS_TASK_INFO
{ ao_task_info, "T\0Tasks" },
+#endif
{ echo, "E <0 off, 1 on>\0Echo" },
{ ao_reboot, "r eboot\0Reboot" },
+#if HAS_VERSION
{ version, "v\0Version" },
+#endif
{ 0, NULL },
};
/* we'll never get back here */
}
+#if HAS_TASK_INFO
void
ao_task_info(void)
{
ao_task_validate();
#endif
}
+#endif
void
ao_start_scheduler(void)
#include <ao_list.h>
#endif
+#ifndef HAS_TASK_INFO
+#define HAS_TASK_INFO 1
+#endif
+
/* An AltOS task */
struct ao_task {
__xdata void *wchan; /* current wait channel (NULL if running) */
/* Turn on the LED until the system is stable */
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_RED);
+ ao_task_init();
+
ao_timer_init();
ao_cmd_init();
ao_usb_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_RED);
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_beep_init();
while (P1_3 == 0)
;
}
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_beep_init();
;
}
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_cmd_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_RED);
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_cmd_init();
PORTE |= (1 << 6);
DDRE |= (1 << 6);
+ ao_task_init();
+
ao_avr_stdio_init();
ao_timer_init();
ao_cmd_init();
PORTE |= (1 << 6);
DDRE |= (1 << 6);
+ ao_task_init();
+
ao_avr_stdio_init();
ao_timer_init();
ao_cmd_init();
/* Turn on the red LED until the system is stable */
ao_led_init(AO_LED_RED|AO_LED_GREEN);
ao_led_on(AO_LED_RED);
+ ao_task_init();
+
ao_timer_init();
ao_beep_init();
ao_cmd_init();
{
ao_clock_init();
+ ao_task_init();
+
ao_timer_init();
ao_beep_init();
ao_cmd_init();
{
ao_clock_init();
+ ao_task_init();
+
// ao_add_task(&blink_0_task, blink_0);
// ao_add_task(&blink_1_task, blink_1);
// ao_add_task(&wakeup_task, wakeup);
/* Turn on the LED until the system is stable */
ao_led_init(AO_LED_RED);
ao_led_on(AO_LED_RED);
+
+ ao_task_init();
+
ao_timer_init();
ao_cmd_init();
ao_usb_init();
ao_led_init(LEDS_AVAILABLE);
+ ao_task_init();
+
ao_serial_init();
ao_timer_init();
ao_cmd_init();
#
ALTOS_SRC = \
ao_interrupt.c \
+ ao_boot_chain.c \
ao_product.c \
ao_romconfig.c \
ao_cmd.c \
CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
-PROG=stm-demo
+PROG=stm-demo-$(VERSION)
+ELF=$(PROG).elf
+IHX=$(PROG).ihx
SRC=$(ALTOS_SRC) ao_demo.c
OBJ=$(SRC:.c=.o)
-all: $(PROG)
+all: $(ELF) $(IHX)
-LDFLAGS=-L../stm -Wl,-Taltos.ld
+LDFLAGS=-L../stm -Wl,-Taltos-application.ld
-$(PROG): Makefile $(OBJ)
- $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+$(ELF): Makefile $(OBJ)
+ $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJ) $(SAT_CLIB) -lgcc
ao_product.h: ao-make-product.5c ../Version
$(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
#include <ao_event.h>
#include <ao_quadrature.h>
#include <ao_button.h>
+#include <ao_boot.h>
struct ao_task demo_task;
}
+static void
+ao_boot_loader(void)
+{
+ flush();
+ ao_boot_reboot((uint32_t *) 0);
+}
+
__code struct ao_cmds ao_demo_cmds[] = {
{ ao_dma_test, "D\0DMA test" },
{ ao_spi_write, "W\0SPI write" },
{ ao_i2c_write, "i\0I2C write" },
{ ao_temp, "t\0Show temp" },
{ ao_event, "e\0Monitor event queue" },
+ { ao_boot_loader, "L\0Reboot to boot loader" },
{ 0, NULL }
};
{
ao_clock_init();
+ ao_task_init();
+
ao_serial_init();
ao_timer_init();
ao_dma_init();
#define HAS_BEEP 0
#define PACKET_HAS_SLAVE 0
+#define AO_BOOT_CHAIN 1
+
#define LOW_LEVEL_DEBUG 1
#define LED_PORT_ENABLE STM_RCC_AHBENR_GPIOBEN
--- /dev/null
+#
+# AltOS build
+#
+#
+
+include ../stm/Makefile.defs
+
+INC = \
+ ao.h \
+ ao_arch.h \
+ ao_arch_funcs.h \
+ ao_pins.h \
+ ao_product.h
+
+#
+# Common AltOS sources
+#
+ALTOS_SRC = \
+ ao_interrupt.c \
+ ao_boot_chain.c \
+ ao_boot_pin.c \
+ ao_product.c \
+ ao_romconfig.c \
+ ao_task.c \
+ ao_timer.c \
+ ao_mutex.c \
+ ao_usb_stm.c \
+ ao_stdio.c \
+ ao_flash_stm.c \
+ ao_cmd.c
+
+PRODUCT=StmFlash-v0.0
+PRODUCT_DEF=-DSTM_FLASH
+IDPRODUCT=0x000a
+
+CFLAGS = $(PRODUCT_DEF) $(STM_CFLAGS) -g -Os
+
+PROG=stm-flash-$(VERSION).elf
+
+SRC=$(ALTOS_SRC) ao_stm_flash.c
+OBJ=$(SRC:.c=.o)
+
+all: $(PROG)
+
+LDFLAGS=-L../stm -Wl,-Taltos-loader.ld
+
+$(PROG): Makefile $(OBJ)
+ $(call quiet,CC) $(LDFLAGS) $(CFLAGS) -o $(PROG) $(OBJ) $(SAT_CLIB) -lgcc
+
+ao_product.h: ao-make-product.5c ../Version
+ $(call quiet,NICKLE,$<) $< -m altusmetrum.org -i $(IDPRODUCT) -p $(PRODUCT) -v $(VERSION) > $@
+
+$(OBJ): $(INC)
+
+distclean: clean
+
+clean:
+ rm -f *.o $(PROG)
+ rm -f ao_product.h
+
+install:
+
+uninstall:
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_PINS_H_
+#define _AO_PINS_H_
+
+#define HAS_TASK_QUEUE 0
+
+/* Bridge SB17 on the board and use the MCO from the other chip */
+#define AO_HSE 8000000
+#define AO_HSE_BYPASS 1
+
+/* PLLVCO = 96MHz (so that USB will work) */
+#define AO_PLLMUL 12
+#define AO_RCC_CFGR_PLLMUL (STM_RCC_CFGR_PLLMUL_12)
+
+/* SYSCLK = 32MHz */
+#define AO_PLLDIV 3
+#define AO_RCC_CFGR_PLLDIV (STM_RCC_CFGR_PLLDIV_3)
+
+/* HCLK = 32MHZ (CPU clock) */
+#define AO_AHB_PRESCALER 1
+#define AO_RCC_CFGR_HPRE_DIV STM_RCC_CFGR_HPRE_DIV_1
+
+/* Run APB1 at HCLK/1 */
+#define AO_APB1_PRESCALER 1
+#define AO_RCC_CFGR_PPRE1_DIV STM_RCC_CFGR_PPRE2_DIV_1
+
+/* Run APB2 at HCLK/1 */
+#define AO_APB2_PRESCALER 1
+#define AO_RCC_CFGR_PPRE2_DIV STM_RCC_CFGR_PPRE2_DIV_1
+
+#define HAS_USB 1
+#define USE_USB_STDIN 1
+#define HAS_BEEP 0
+
+#define PACKET_HAS_SLAVE 0
+
+#define LED_PORT_ENABLE STM_RCC_AHBENR_GPIOCEN
+#define LED_PORT (&stm_gpiob)
+#define LED_PIN_RED 6
+#define LED_PIN_GREEN 7
+#define AO_LED_RED (1 << LED_PIN_RED)
+#define AO_LED_GREEN (1 << LED_PIN_GREEN)
+
+#define LEDS_AVAILABLE (AO_LED_RED | AO_LED_GREEN)
+
+#define AO_TICK_TYPE uint32_t
+#define AO_TICK_SIGNED int32_t
+
+#define HAS_TASK_INFO 0
+#define HAS_VERSION 0
+
+#define AO_BOOT_CHAIN 1
+#define AO_BOOT_PIN 1
+
+#define AO_BOOT_APPLICATION_GPIO stm_gpioa
+#define AO_BOOT_APPLICATION_PIN 0
+#define AO_BOOT_APPLICATION_VALUE 1
+#define AO_BOOT_APPLICATION_MODE 0
+#define AO_BOOT_APPLICATION_BASE ((uint32_t *) 0x2000)
+
+#endif /* _AO_PINS_H_ */
--- /dev/null
+/*
+ * Copyright © 2011 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include "ao.h"
+#include <ao_exti.h>
+#include <ao_boot.h>
+#include <ao_flash_stm.h>
+
+void
+ao_panic(uint8_t reason)
+{
+ for (;;);
+}
+
+void
+ao_application(void)
+{
+ ao_boot_reboot(AO_BOOT_APPLICATION_BASE);
+}
+
+static uint32_t
+ao_cmd_hex32(void)
+{
+ __pdata uint8_t r = ao_cmd_lex_error;
+ int8_t n;
+ uint32_t v = 0;
+
+ ao_cmd_white();
+ for(;;) {
+ n = ao_cmd_hexchar(ao_cmd_lex_c);
+ if (n < 0)
+ break;
+ v = (v << 4) | n;
+ r = ao_cmd_success;
+ ao_cmd_lex();
+ }
+ if (r != ao_cmd_success)
+ ao_cmd_status = r;
+ return v;
+}
+
+void
+ao_block_erase(void)
+{
+ uint32_t addr = ao_cmd_hex32();
+ uint32_t *p = (uint32_t *) addr;
+
+ ao_flash_erase_page(p);
+}
+
+void
+ao_block_write(void)
+{
+ uint32_t addr = ao_cmd_hex32();
+ uint32_t *p = (uint32_t *) addr;
+ union {
+ uint8_t data8[256];
+ uint32_t data32[64];
+ } u;
+ uint16_t i;
+
+ if (addr < 0x08002000 || 0x08200000 <= addr) {
+ ao_put_string("Invalid address\n");
+ return;
+ }
+ for (i = 0; i < 256; i++)
+ u.data8[i] = getchar();
+ ao_flash_page(p, u.data32);
+}
+
+static void
+puthex(uint8_t c)
+{
+ c &= 0xf;
+ if (c < 10)
+ c += '0';
+ else
+ c += 'a' - 10;
+ putchar (c);
+}
+
+void
+ao_block_read(void)
+{
+ uint32_t addr = ao_cmd_hex32();
+ uint8_t *p = (uint8_t *) addr;
+ uint16_t i;
+ uint8_t c;
+
+ for (i = 0; i < 256; i++) {
+ c = *p++;
+ (*ao_stdios[ao_cur_stdio].putchar)(c);
+ }
+}
+
+void
+ao_block_read_hex(void)
+{
+ uint32_t addr = ao_cmd_hex32();
+ uint8_t *p = (uint8_t *) addr;
+ uint16_t i;
+ uint8_t c;
+
+ for (i = 0; i < 256; i++) {
+ c = *p++;
+ puthex(c>>4);
+ puthex(c);
+ if ((i & 0xf) == 0xf)
+ putchar('\n');
+ }
+}
+
+static void
+ao_show_version(void)
+{
+ puts("altos-loader");
+ ao_put_string("manufacturer "); puts(ao_manufacturer);
+ ao_put_string("product "); puts(ao_product);
+ ao_put_string("software-version "); puts(ao_version);
+}
+
+__code struct ao_cmds ao_flash_cmds[] = {
+ { ao_show_version, "v\0Version" },
+ { ao_application, "a\0Switch to application" },
+ { ao_block_erase, "X <addr>\0Erase block." },
+ { ao_block_write, "W <addr>\0Write block. 256 binary bytes follow newline" },
+ { ao_block_read, "R <addr>\0Read block. Returns 256 binary bytes" },
+ { ao_block_read_hex, "H <addr>\0Hex read block. Returns 256 bytes in hex" },
+ { 0, NULL },
+};
+
+int
+main(void)
+{
+ ao_clock_init();
+
+ ao_task_init();
+
+ ao_timer_init();
+// ao_dma_init();
+ ao_cmd_init();
+// ao_exti_init();
+ ao_usb_init();
+
+ ao_cmd_register(&ao_flash_cmds[0]);
+ ao_start_scheduler();
+ return 0;
+}
vpath matrix.5c ../kalman
vpath ao-make-product.5c ../util
+.SUFFIXES: .elf .ihx
+
+.elf.ihx:
+ objcopy -O ihex $*.elf $@
+
CC=arm-none-eabi-gcc
SAT=/opt/cortex
SAT_CLIB=$(SAT)/lib/pdclib-cortex-m3.a
--- /dev/null
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+MEMORY {
+ rom (rx) : ORIGIN = 0x08002000, LENGTH = 120K
+ ram (!w) : ORIGIN = 0x20000000, LENGTH = 16K
+}
+
+INCLUDE registers.ld
+
+EXTERN (stm_interrupt_vector)
+
+SECTIONS {
+ /*
+ * Rom contents
+ */
+
+ .text ORIGIN(rom) : {
+ __text_start__ = .;
+ *(.interrupt) /* Interrupt vectors */
+
+ . = ORIGIN(rom) + 0x100;
+
+
+ /* Ick. What I want is to specify the
+ * addresses of some global constants so
+ * that I can find them across versions
+ * of the application. I can't figure out
+ * how to make gnu ld do that, so instead
+ * we just load the two files that include
+ * these defines in the right order here and
+ * expect things to 'just work'. Don't change
+ * the contents of those files, ok?
+ */
+ ao_romconfig.o(.romconfig*)
+ ao_product.o(.romconfig*)
+ *(.text*) /* Executable code */
+ *(.rodata*) /* Constants */
+
+ } > rom
+
+ .ARM.exidx : {
+ *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+ } > rom
+ __text_end__ = .;
+
+ /* Boot data which must live at the start of ram so that
+ * the application and bootloader share the same addresses.
+ * This must be all uninitialized data
+ */
+ .boot (NOLOAD) : {
+ __boot_start__ = .;
+ *(.boot)
+ . = ALIGN(4);
+ __boot_end__ = .;
+ } >ram
+
+ /* Data -- relocated to RAM, but written to ROM
+ */
+ .data : {
+ __data_start__ = .;
+ *(.data) /* initialized data */
+ . = ALIGN(4);
+ __data_end__ = .;
+ } >ram AT>rom
+
+ .bss : {
+ __bss_start__ = .;
+ *(.bss)
+ *(COMMON)
+ . = ALIGN(4);
+ __bss_end__ = .;
+ } >ram
+
+ PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
+ PROVIDE(end = .);
+}
+
+ENTRY(start);
+
+
--- /dev/null
+/*
+ * Copyright © 2012 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+MEMORY {
+ rom : ORIGIN = 0x08000000, LENGTH = 8K
+ ram : ORIGIN = 0x20000000, LENGTH = 16K
+}
+
+INCLUDE registers.ld
+
+EXTERN (stm_interrupt_vector)
+
+SECTIONS {
+ /*
+ * Rom contents
+ */
+
+ .text : {
+ __text_start__ = .;
+ *(.interrupt) /* Interrupt vectors */
+
+ . = ORIGIN(rom) + 0x100;
+
+ /* Ick. What I want is to specify the
+ * addresses of some global constants so
+ * that I can find them across versions
+ * of the application. I can't figure out
+ * how to make gnu ld do that, so instead
+ * we just load the two files that include
+ * these defines in the right order here and
+ * expect things to 'just work'. Don't change
+ * the contents of those files, ok?
+ */
+ ao_romconfig.o(.romconfig*)
+ ao_product.o(.romconfig*)
+ *(.text) /* Executable code */
+ *(.rodata) /* Constants */
+
+ } > rom
+
+ .ARM.exidx : {
+ *(.ARM.exidx* .gnu.linkonce.armexidx.*)
+ } > rom
+ __text_end__ = .;
+
+ /* Boot data which must live at the start of ram so that
+ * the application and bootloader share the same addresses.
+ * This must be all uninitialized data
+ */
+ .boot (NOLOAD) : {
+ __boot_start__ = .;
+ *(.boot)
+ . = ALIGN(4);
+ __boot_end__ = .;
+ } >ram
+
+ /* Functions placed in RAM (required for flashing) */
+ .textram : {
+ __text_ram_start__ = .;
+ __data_start__ = .;
+ *(.text.ram)
+ . = ALIGN(4);
+ } >ram AT>rom
+ __text_ram_end = .;
+
+ /* Data -- relocated to RAM, but written to ROM
+ */
+ .data : {
+ *(.data) /* initialized data */
+ . = ALIGN (4);
+ } >ram AT>rom
+ __data_end__ = .;
+
+ .bss : {
+ __bss_start__ = .;
+ *(.bss)
+ *(COMMON)
+ __bss_end__ = .;
+ } >ram
+
+ PROVIDE(__stack__ = ORIGIN(ram) + LENGTH(ram));
+ PROVIDE(end = .);
+}
+
+ENTRY(start);
+
+
stm_rcc.ahbenr |= (1 << STM_RCC_AHBENR_GPIOEEN); \
} while (0)
+#define ao_disable_port(port) do { \
+ if ((port) == &stm_gpioa) \
+ stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOAEN); \
+ else if ((port) == &stm_gpiob) \
+ stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOBEN); \
+ else if ((port) == &stm_gpioc) \
+ stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOCEN); \
+ else if ((port) == &stm_gpiod) \
+ stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIODEN); \
+ else if ((port) == &stm_gpioe) \
+ stm_rcc.ahbenr &= ~(1 << STM_RCC_AHBENR_GPIOEEN); \
+ } while (0)
+
#define ao_gpio_set(port, bit, pin, v) stm_gpio_set(port, bit, v)
stm_moder_set(port, bit, STM_MODER_OUTPUT);\
} while (0)
-#define ao_enable_input(port,bit,mode) do { \
- ao_enable_port(port); \
- stm_moder_set(port, bit, STM_MODER_INPUT); \
+#define ao_gpio_set_mode(port,bit,mode) do { \
if (mode == AO_EXTI_MODE_PULL_UP) \
stm_pupdr_set(port, bit, STM_PUPDR_PULL_UP); \
else if (mode == AO_EXTI_MODE_PULL_DOWN) \
else \
stm_pupdr_set(port, bit, STM_PUPDR_NONE); \
} while (0)
+
+#define ao_enable_input(port,bit,mode) do { \
+ ao_enable_port(port); \
+ stm_moder_set(port, bit, STM_MODER_INPUT); \
+ ao_gpio_set_mode(port, bit, mode); \
+ } while (0)
#define ao_enable_cs(port,bit) do { \
stm_gpio_set((port), bit, 1); \
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_BOOT_H_
+#define _AO_BOOT_H_
+
+void
+ao_boot_chain(uint32_t *base);
+
+void
+ao_boot_check_pin(void);
+
+void
+ao_boot_check_chain(void);
+
+void
+ao_boot_reboot(uint32_t *base);
+
+#endif /* _AO_BOOT_H_ */
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_boot.h>
+
+void
+ao_boot_chain(uint32_t *base)
+{
+ uint32_t sp;
+ uint32_t pc;
+
+ sp = base[0];
+ pc = base[1];
+ if (0x08000100 <= pc && pc <= 0x08200000) {
+ asm ("mov sp, %0" : : "r" (sp));
+ asm ("mov lr, %0" : : "r" (pc));
+ asm ("bx lr");
+ }
+}
+
+#define AO_BOOT_SIGNAL 0x5a5aa5a5
+#define AO_BOOT_CHECK 0xc3c33c3c
+
+struct ao_boot {
+ uint32_t *base;
+ uint32_t signal;
+ uint32_t check;
+};
+
+static struct ao_boot __attribute__ ((section(".boot"))) ao_boot;
+
+void
+ao_boot_check_chain(void)
+{
+ if (ao_boot.signal == AO_BOOT_SIGNAL && ao_boot.check == AO_BOOT_CHECK) {
+ ao_boot.signal = 0;
+ ao_boot.check = 0;
+ ao_boot_chain(ao_boot.base);
+ }
+}
+
+void
+ao_boot_reboot(uint32_t *base)
+{
+ ao_boot.base = base;
+ ao_boot.signal = AO_BOOT_SIGNAL;
+ ao_boot.check = AO_BOOT_CHECK;
+ ao_arch_reboot();
+}
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_boot.h>
+#include <ao_exti.h>
+
+void
+ao_boot_check_pin(void)
+{
+ uint16_t v;
+
+ /* Enable power interface clock */
+ stm_rcc.apb1enr |= (1 << STM_RCC_APB1ENR_PWREN);
+
+ /* Enable the input pin */
+ ao_enable_input(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN,
+ AO_BOOT_APPLICATION_MODE);
+
+ /* Read the value */
+ v = stm_gpio_get(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN);
+
+ /* Reset the chip to turn off the port and the power interface clock */
+ ao_gpio_set_mode(&AO_BOOT_APPLICATION_GPIO, AO_BOOT_APPLICATION_PIN, 0);
+ ao_disable_port(&AO_BOOT_APPLICATION_GPIO);
+ stm_rcc.apb1enr &= ~(1 << STM_RCC_APB1ENR_PWREN);
+ if (v == AO_BOOT_APPLICATION_VALUE)
+ ao_boot_chain(AO_BOOT_APPLICATION_BASE);
+}
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <ao.h>
+#include <ao_flash_stm.h>
+
+static uint8_t
+ao_flash_pecr_is_locked(void)
+{
+ return (stm_flash.pecr & (1 << STM_FLASH_PECR_PELOCK)) != 0;
+}
+
+static uint8_t
+ao_flash_pgr_is_locked(void)
+{
+ return (stm_flash.pecr & (1 << STM_FLASH_PECR_PRGLOCK)) != 0;
+}
+
+static void
+ao_flash_pecr_unlock(void)
+{
+ if (!ao_flash_pecr_is_locked())
+ return;
+
+ /* Unlock Data EEPROM and FLASH_PECR register */
+ stm_flash.pekeyr = STM_FLASH_PEKEYR_PEKEY1;
+ stm_flash.pekeyr = STM_FLASH_PEKEYR_PEKEY2;
+ if (ao_flash_pecr_is_locked())
+ ao_panic(AO_PANIC_FLASH);
+}
+
+static void
+ao_flash_pgr_unlock(void)
+{
+ if (!ao_flash_pgr_is_locked())
+ return;
+
+ /* Unlock program memory */
+ stm_flash.prgkeyr = STM_FLASH_PRGKEYR_PRGKEY1;
+ stm_flash.prgkeyr = STM_FLASH_PRGKEYR_PRGKEY2;
+ if (ao_flash_pgr_is_locked())
+ ao_panic(AO_PANIC_FLASH);
+}
+
+static void
+ao_flash_lock(void)
+{
+ stm_flash.pecr |= (1 << STM_FLASH_PECR_OPTLOCK) | (1 << STM_FLASH_PECR_PRGLOCK) | (1 << STM_FLASH_PECR_PELOCK);
+}
+
+static void
+ao_flash_wait_bsy(void)
+{
+ while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
+ ;
+}
+
+static void __attribute__ ((section(".text.ram"),noinline))
+_ao_flash_erase_page(uint32_t *page)
+{
+ stm_flash.pecr |= (1 << STM_FLASH_PECR_ERASE) | (1 << STM_FLASH_PECR_PROG);
+
+ *page = 0x00000000;
+
+ while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
+ ;
+}
+
+void
+ao_flash_erase_page(uint32_t *page)
+{
+ ao_flash_pecr_unlock();
+ ao_flash_pgr_unlock();
+
+ _ao_flash_erase_page(page);
+
+ ao_flash_lock();
+}
+
+static void __attribute__ ((section(".text.ram"), noinline))
+_ao_flash_half_page(uint32_t *dst, uint32_t *src)
+{
+ uint8_t i;
+
+ stm_flash.pecr |= (1 << STM_FLASH_PECR_FPRG);
+ stm_flash.pecr |= (1 << STM_FLASH_PECR_PROG);
+
+ while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
+ ;
+
+ for (i = 0; i < 32; i++) {
+ *dst++ = *src++;
+ }
+
+ while (stm_flash.sr & (1 << STM_FLASH_SR_BSY))
+ ;
+}
+
+void
+ao_flash_page(uint32_t *page, uint32_t *src)
+{
+ uint8_t h;
+
+ ao_flash_erase_page(page);
+ ao_flash_pecr_unlock();
+ ao_flash_pgr_unlock();
+ for (h = 0; h < 2; h++) {
+ _ao_flash_half_page(page, src);
+ page += 32;
+ src += 32;
+ }
+ ao_flash_lock();
+}
--- /dev/null
+/*
+ * Copyright © 2013 Keith Packard <keithp@keithp.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; version 2 of the License.
+ *
+ * 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, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#ifndef _AO_FLASH_STM_H_
+#define _AO_FLASH_STM_H_
+
+void
+ao_flash_erase_page(uint32_t *page);
+
+void
+ao_flash_page(uint32_t *page, uint32_t *src);
+
+#endif /* _AO_FLASH_STM_H_ */
#include <ao.h>
#include "stm32l.h"
#include <string.h>
+#include <ao_boot.h>
extern void main(void);
extern char __stack__;
{
}
-void start(void) {
+const void *stm_interrupt_vector[];
+
+void start(void)
+{
+#ifdef AO_BOOT_CHAIN
+ ao_boot_check_chain();
+#endif
+#ifdef AO_BOOT_PIN
+ ao_boot_check_pin();
+#endif
+ /* Set interrupt vector table offset */
+ stm_nvic.vto = (uint32_t) &stm_interrupt_vector;
memcpy(&__data_start__, &__text_end__, &__data_end__ - &__data_start__);
memset(&__bss_start__, '\0', &__bss_end__ - &__bss_start__);
main();
AO_ROMCONFIG_SYMBOL (0) uint16_t ao_romconfig_version = AO_ROMCONFIG_VERSION;
AO_ROMCONFIG_SYMBOL (0) uint16_t ao_romconfig_check = ~AO_ROMCONFIG_VERSION;
AO_ROMCONFIG_SYMBOL (0) uint16_t ao_serial_number = 0;
-#ifdef AO_RADIO_CAL_DEFAULT
-AO_ROMCONFIG_SYMBOL (0) uint32_t ao_radio_cal = AO_RADIO_CAL_DEFAULT;
+#ifndef AO_RADIO_CAL_DEFAULT
+#define AO_RADIO_CAL_DEFAULT 0x01020304
#endif
+AO_ROMCONFIG_SYMBOL (0) uint32_t ao_radio_cal = AO_RADIO_CAL_DEFAULT;
+
#define STM_FLASH_PEKEYR_PEKEY1 0x89ABCDEF
#define STM_FLASH_PEKEYR_PEKEY2 0x02030405
+#define STM_FLASH_PRGKEYR_PRGKEY1 0x8C9DAEBF
+#define STM_FLASH_PRGKEYR_PRGKEY2 0x13141516
+
struct stm_rcc {
vuint32_t cr;
vuint32_t icscr;
while (P1_3 == 0)
;
}
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_beep_init();
/* Turn on the LED until the system is stable */
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_RED);
+
+ ao_task_init();
+
ao_timer_init();
ao_cmd_init();
ao_usb_init();
ao_led_init(LEDS_AVAILABLE);
+ ao_task_init();
+
ao_timer_init();
ao_adc_init();
ao_beep_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_GREEN);
+ ao_task_init();
+
ao_timer_init();
ao_spi_init();
ao_mpu_init();
#endif
- ao_task_init();
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_GREEN);
+
+ ao_task_init();
+
ao_timer_init();
ao_spi_init();
/* Turn on the LED until the system is stable */
ao_led_init(LEDS_AVAILABLE);
ao_led_on(AO_LED_RED);
+ ao_task_init();
ao_timer_init();
ao_cmd_init();
ao_spi_init();
projects / fw / altos / commitdiff