From 141137dfe5bdc7400d5cc1ad388b670f9f2e9446 Mon Sep 17 00:00:00 2001 From: Nao Pross Date: Thu, 23 Nov 2017 14:34:55 +0100 Subject: update cpld files from VHDL dev machine and delete programmer code (unused) --- sw/programmer/linux/config.h | 26 ---- sw/programmer/linux/configure.ac | 23 ---- sw/programmer/linux/makefile.am | 2 - sw/programmer/linux/reading_links.txt | 4 - sw/programmer/linux/src/flash.c | 70 ----------- sw/programmer/linux/src/flash.h | 22 ---- sw/programmer/linux/src/main.c | 67 ---------- sw/programmer/linux/src/makefile.am | 7 -- sw/programmer/linux/src/serial.c | 90 -------------- sw/programmer/linux/src/serial.h | 17 --- sw/programmer/linux/src/ui.c | 143 ---------------------- sw/programmer/linux/src/ui.h | 24 ---- sw/programmer/linux/src/z80prog | Bin 52072 -> 0 bytes sw/programmer/linux/src/z80prog.ui | 223 ---------------------------------- 14 files changed, 718 deletions(-) delete mode 100644 sw/programmer/linux/config.h delete mode 100644 sw/programmer/linux/configure.ac delete mode 100644 sw/programmer/linux/makefile.am delete mode 100644 sw/programmer/linux/reading_links.txt delete mode 100644 sw/programmer/linux/src/flash.c delete mode 100644 sw/programmer/linux/src/flash.h delete mode 100644 sw/programmer/linux/src/main.c delete mode 100644 sw/programmer/linux/src/makefile.am delete mode 100644 sw/programmer/linux/src/serial.c delete mode 100644 sw/programmer/linux/src/serial.h delete mode 100644 sw/programmer/linux/src/ui.c delete mode 100644 sw/programmer/linux/src/ui.h delete mode 100755 sw/programmer/linux/src/z80prog delete mode 100644 sw/programmer/linux/src/z80prog.ui (limited to 'sw/programmer/linux') diff --git a/sw/programmer/linux/config.h b/sw/programmer/linux/config.h deleted file mode 100644 index d319f43..0000000 --- a/sw/programmer/linux/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Name of package */ -#define PACKAGE "z80prog" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "naopross@tharcway.org" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "z80prog" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "z80prog 0.1" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "z80prog" - -/* Define to the home page for this package. */ -#define PACKAGE_URL "" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "0.1" - -/* Version number of package */ -#define VERSION "0.1" diff --git a/sw/programmer/linux/configure.ac b/sw/programmer/linux/configure.ac deleted file mode 100644 index a5c4b3b..0000000 --- a/sw/programmer/linux/configure.ac +++ /dev/null @@ -1,23 +0,0 @@ -AC_CONFIG_SRCDIR([src]) -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_AUX_DIR([build-aux]) - -AC_INIT([z80prog], [0.1], [naopross@tharcway.org]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) - -AC_PROG_CC - -#### -# Check for required packages / libraries -# -LIBGTK_REQUIRED=2.91 - -PKG_CHECK_MODULES(gtk3, [gtk+-3.0 >= $LIBGTK_REQUIRED]) - -AC_CONFIG_FILES([ - makefile - src/makefile -]) - -AC_OUTPUT diff --git a/sw/programmer/linux/makefile.am b/sw/programmer/linux/makefile.am deleted file mode 100644 index 4d27cea..0000000 --- a/sw/programmer/linux/makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -SUBDIRS = src -CLEANFILES = *~ diff --git a/sw/programmer/linux/reading_links.txt b/sw/programmer/linux/reading_links.txt deleted file mode 100644 index 83c62f4..0000000 --- a/sw/programmer/linux/reading_links.txt +++ /dev/null @@ -1,4 +0,0 @@ -https://developer.gnome.org/gtk3/stable/ch01s04.html#id-1.2.3.12.5 -https://developer.gnome.org/gio/unstable/GApplication.html -https://git.gnome.org/browse/gnome-hello/tree/src/app.c - diff --git a/sw/programmer/linux/src/flash.c b/sw/programmer/linux/src/flash.c deleted file mode 100644 index 3527de8..0000000 --- a/sw/programmer/linux/src/flash.c +++ /dev/null @@ -1,70 +0,0 @@ -#include "flash.h" - -static int flash_serial_fd = -1; - -int flash_open(const char *path, unsigned long baudrate) -{ - flash_serial_fd = serial_open(path, baudrate); - - if (flash_serial_fd < 0) - return -1; - - return 0; -} - -int flash_write(const char *romfile, void (*log)(const char *)) -{ - int romfd; - int v; - ssize_t written; - - struct stat romst; - struct flash_blk head; - - uint8_t *buffer = malloc(FLASH_BLOCK_SIZE); - - romfd = open(romfile, O_RDONLY); - - if (fstat(romfd, &romst) != 0) - goto exit_romfd; - - while ((head.size = read(romfd, buffer, FLASH_BLOCK_SIZE))) { - if (head.size < 0) { - log("[!] Error while reading from file\n"); - break; - } - - head.addr = (uint16_t) lseek(romfd, 0, SEEK_CUR) - head.size; - - char logbuf[64]; - sprintf(logbuf, "[@] Writing a block of size %d at addr %d\n", head.size, head.addr); - log(logbuf); - - written = write(flash_serial_fd, &head, sizeof(struct flash_blk)); - if (written != sizeof(struct flash_blk)) { - log("[!] Some bytes of flash_blk haven't been written\n"); - } - - written = write(flash_serial_fd, buffer, head.size); - if (written != head.size) { - log("[#] Some bytes might not have been written\n"); - } - - while (!read(flash_serial_fd, &v, 1)); - - sprintf(logbuf, "[@] Written %d bytes at address %d\n", head.size, head.addr); - log(logbuf); - } - -exit_romfd: - close(romfd); - - free(buffer); - return 0; -} - -void flash_close(void) -{ - if (flash_serial_fd >= 0) - close(flash_serial_fd); -} \ No newline at end of file diff --git a/sw/programmer/linux/src/flash.h b/sw/programmer/linux/src/flash.h deleted file mode 100644 index 373ebf3..0000000 --- a/sw/programmer/linux/src/flash.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef __FLASH_H__ -#define __FLASH_H__ - -#include "serial.h" - -#include -#include -#include - -#define FLASH_BLOCK_SIZE 512 - -struct flash_blk -{ - uint16_t addr; - uint16_t size; -}; - -int flash_open(const char *devpath, unsigned long baudrate); -int flash_write(const char *romfile, void (*log)(const char *)); -void flash_close(void); - -#endif diff --git a/sw/programmer/linux/src/main.c b/sw/programmer/linux/src/main.c deleted file mode 100644 index 1bfd359..0000000 --- a/sw/programmer/linux/src/main.c +++ /dev/null @@ -1,67 +0,0 @@ -#include "config.h" -#include "ui.h" - -#include -#include -#include -#include -#include - -void out(const char *msg) -{ - printf("%s", msg); -} - -int main(int argc, char *argv[]) -{ - int opt; - int use_ui = 0; - - unsigned long baudrate; - char *file, *device, *baud; - - file = device = baud = NULL; - - while ((opt = getopt(argc, argv, "gf:d:b:")) != -1) { - switch (opt) { - case 'g': - use_ui = 1; - break; - case 'f': - file = optarg; - break; - case 'd': - device = optarg; - break; - case 'b': - baud = optarg; - break; - } - } - - if (use_ui) { - ui_init(&argc, &argv); - return 0; - } - - if (file == NULL || device == NULL || baud == NULL) { - perror("Missing argument\n"); - return -1; - } - - baudrate = strtoul(baud, NULL, 0); - if (errno == ERANGE) { - perror("Invalid baudrate\n"); - return -1; - } - - if (flash_open(device, baudrate) < 0) { - perror("Failed to open device\n"); - return -2; - } - - flash_write(file, out); - flash_close(); - - return 0; -} diff --git a/sw/programmer/linux/src/makefile.am b/sw/programmer/linux/src/makefile.am deleted file mode 100644 index 33ae438..0000000 --- a/sw/programmer/linux/src/makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -bin_PROGRAMS = z80prog -z80prog_SOURCES = main.c ui.c serial.c flash.c - -z80prog_CFLAGS = -Wall -g $(gtk3_CFLAGS) -pthread -z80prog_LDADD = $(gtk3_LIBS) - -CLEANFILES = *~ diff --git a/sw/programmer/linux/src/serial.c b/sw/programmer/linux/src/serial.c deleted file mode 100644 index 42f021e..0000000 --- a/sw/programmer/linux/src/serial.c +++ /dev/null @@ -1,90 +0,0 @@ -#include "serial.h" - -static int rate_to_constant(int baudrate) { -#define B(x) case x: return B##x - switch(baudrate) { - B(50); B(75); B(110); B(134); B(150); - B(200); B(300); B(600); B(1200); B(1800); - B(2400); B(4800); B(9600); B(19200); B(38400); - B(57600); B(115200); B(230400); B(460800); B(500000); - B(576000); B(921600); B(1000000);B(1152000);B(1500000); - default: return 0; - } -#undef B -} - -int serial_open(const char *devpath, unsigned long baudrate) -{ - int fd, speed; - struct termios tty; - struct serial_struct serinfo; - // struct termios tty_old; - - // open device - if ((fd = open(devpath, O_RDWR | O_NOCTTY)) < 0) { - return -1; - } - - speed = rate_to_constant(baudrate); - if (speed == 0) { - /* custom divisor */ - serinfo.reserved_char[0] = 0; - if (ioctl(fd, TIOCGSERIAL, &serinfo) < 0) - return -1; - serinfo.flags &= ~ASYNC_SPD_MASK; - serinfo.flags |= ASYNC_SPD_CUST; - serinfo.custom_divisor = (serinfo.baud_base + (baudrate / 2)) / baudrate; - - if (serinfo.custom_divisor < 1) - serinfo.custom_divisor = 1; - if (ioctl(fd, TIOCSSERIAL, &serinfo) < 0) - return -1; - if (ioctl(fd, TIOCGSERIAL, &serinfo) < 0) - return -1; - if (serinfo.custom_divisor * baudrate != serinfo.baud_base) { - warnx("actual baudrate is %d / %d = %f", - serinfo.baud_base, serinfo.custom_divisor, - (float)serinfo.baud_base / serinfo.custom_divisor); - } - } - - // set custom baudrate - ioctl(fd, TIOCGSERIAL, &serinfo); - serinfo.flags = ASYNC_SPD_CUST | ASYNC_LOW_LATENCY; - serinfo.custom_divisor = serinfo.baud_base / baudrate; - ioctl(fd, TIOCSSERIAL, &serinfo); - - // set parameters - if (tcgetattr(fd, &tty) != 0) { - // perror("failed tcgetattr"); - return -1; - } - - cfsetispeed(&tty, speed ?: B38400); - cfsetospeed(&tty, speed ?: B38400); - cfmakeraw(&tty); - - tty.c_cflag &= ~PARENB; // no parity - tty.c_cflag &= ~CSTOPB; // no stop bit - tty.c_cflag |= CS8; // 8 bit data - tty.c_cflag &= ~CRTSCTS; // no flow control - - tty.c_lflag = 0; // no signaling chars, no echo, no canonical processing - tty.c_oflag = 0; // no remapping, no delays - tty.c_cc[VMIN] = 0; // no block read - tty.c_cc[VTIME] = 5; // .5 seconds read timeout - - tty.c_cflag |= CREAD | CLOCAL; // turn on read and ignore ctrl lines - tty.c_iflag &= ~(IXON | IXOFF | IXANY); // turn off s/w flow ctrl - tty.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); // make raw - tty.c_oflag &= ~OPOST; // make raw - - tcflush(fd , TCIFLUSH); // ? - - if (tcsetattr (fd, TCSANOW, &tty) != 0) { - // perror("failed tcsetattr to set serial port.\n"); - return -1; - } - - return fd; -} diff --git a/sw/programmer/linux/src/serial.h b/sw/programmer/linux/src/serial.h deleted file mode 100644 index dd70756..0000000 --- a/sw/programmer/linux/src/serial.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __Z80PROG_SERIAL_H__ -#define __Z80PROG_SERIAL_H__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -int serial_open(const char *devpath, unsigned long baudrate); - -#endif diff --git a/sw/programmer/linux/src/ui.c b/sw/programmer/linux/src/ui.c deleted file mode 100644 index b53ff0b..0000000 --- a/sw/programmer/linux/src/ui.c +++ /dev/null @@ -1,143 +0,0 @@ -#include "ui.h" - -static bool ui_connected, ui_fileset; -static GtkBuilder *ui_builder; - -void ui_init(int *argc, char **argv[]) -{ - GtkWindow *window; - GtkFileChooserButton *filechoosebtn; - GtkButton *connectbtn, *flashbtn; - - ui_connected = ui_fileset = false; - - gtk_init(argc, argv); - - ui_builder = gtk_builder_new(); - gtk_builder_add_from_file(ui_builder, "z80prog.ui", NULL); - - /* connect objects to callbacks */ - window = GTK_WINDOW(gtk_builder_get_object(ui_builder, "window")); - g_signal_connect(window, "delete_event", G_CALLBACK(flash_close), NULL); - g_signal_connect(window, "destroy", G_CALLBACK(gtk_main_quit), NULL); - - connectbtn = GTK_BUTTON(gtk_builder_get_object(ui_builder, "connectbtn")); - g_signal_connect(connectbtn, "clicked", G_CALLBACK(ui_connect_clicked), NULL); - - flashbtn = GTK_BUTTON(gtk_builder_get_object(ui_builder, "flashbtn")); - g_signal_connect(flashbtn, "clicked", G_CALLBACK(ui_flash_clicked), NULL); - - filechoosebtn = GTK_FILE_CHOOSER_BUTTON(gtk_builder_get_object(ui_builder, "filechoosebtn")); - g_signal_connect(filechoosebtn, "file-set", G_CALLBACK(ui_file_set), NULL); - - /* start gtk window */ - gtk_main(); -} - -void ui_log(const char *msg) -{ - GtkTextIter end; - GtkTextView *ui_log; - - static GtkTextBuffer *ui_logbuf = NULL; - - ui_log = GTK_TEXT_VIEW(gtk_builder_get_object(ui_builder, "logview")); - - if (ui_logbuf == NULL) { - ui_logbuf = gtk_text_buffer_new(NULL); - gtk_text_view_set_buffer(ui_log, ui_logbuf); - } - - gtk_text_buffer_get_end_iter(ui_logbuf, &end); - gtk_text_buffer_insert(ui_logbuf, &end, msg, -1); - gtk_text_view_scroll_to_iter(ui_log, &end, .0, TRUE, .0, .1); -} - -void ui_check_enable_flashbtn(void) -{ - GtkWidget *ui_flashbtn = GTK_WIDGET(gtk_builder_get_object(ui_builder, "flashbtn")); - - if (ui_connected && ui_fileset) - gtk_widget_set_sensitive(ui_flashbtn, TRUE); - else - gtk_widget_set_sensitive(ui_flashbtn, FALSE); -} - -void ui_file_set(GtkFileChooserButton *btn, gpointer user_data) -{ - GtkEntry *filepath = GTK_ENTRY(gtk_builder_get_object(ui_builder, "filepath")); - - gtk_entry_set_text(filepath, gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(btn))); - ui_log(UI_LOG_MSG "file set\n"); - ui_fileset = true; - - ui_check_enable_flashbtn(); -} - -void ui_connect_clicked(void) -{ - GtkEntry *ui_devpath = GTK_ENTRY(gtk_builder_get_object(ui_builder, "devpath")); - GtkSpinButton *ui_baudrate = GTK_SPIN_BUTTON(gtk_builder_get_object(ui_builder, "devbaudrate")); - GtkButton *ui_connectbtn = GTK_BUTTON(gtk_builder_get_object(ui_builder, "connectbtn")); - - unsigned long baudrate = gtk_spin_button_get_value_as_int(ui_baudrate); - const char *devpath = gtk_entry_get_text(ui_devpath); - - if (flash_open(devpath, baudrate) != 0) { - ui_log(UI_LOG_ERR "failed to open serial device\n"); - } else { - ui_connected = true; - ui_log(UI_LOG_MSG "connected to serial device "); - ui_log(devpath); - ui_log("\n"); - - g_signal_handlers_disconnect_by_func(ui_connectbtn, G_CALLBACK(ui_connect_clicked), NULL); - g_signal_connect(ui_connectbtn, "clicked", G_CALLBACK(ui_disconnect_clicked), NULL); - - gtk_button_set_label(ui_connectbtn, "gtk-disconnect"); - ui_check_enable_flashbtn(); - } -} - -void ui_disconnect_clicked(void) -{ - GtkButton *ui_connectbtn = GTK_BUTTON(gtk_builder_get_object(ui_builder, "connectbtn")); - - flash_close(); - - ui_connected = false; - ui_log(UI_LOG_MSG "disconnected\n"); - - g_signal_handlers_disconnect_by_func(ui_connectbtn, G_CALLBACK(ui_disconnect_clicked), NULL); - g_signal_connect(ui_connectbtn, "clicked", G_CALLBACK(ui_connect_clicked), NULL); - - gtk_button_set_label(ui_connectbtn, "gtk-connect"); - ui_check_enable_flashbtn(); -} - -int ui_flash_write_start(void *ptr) -{ - const char *filepath = (const char *) ptr; - - flash_write(filepath, ui_log); - ui_check_enable_flashbtn(); - - return 0; -} - -void ui_flash_clicked(void) -{ - GtkWidget *ui_flashbtn = GTK_WIDGET(gtk_builder_get_object(ui_builder, "flashbtn")); - GtkEntry *ui_filepath = GTK_ENTRY(gtk_builder_get_object(ui_builder, "filepath")); - - const char *filepath = gtk_entry_get_text(ui_filepath); - - gdk_threads_add_idle_full( - G_PRIORITY_HIGH_IDLE, - ui_flash_write_start, - (void *) filepath, - NULL - ); - - gtk_widget_set_sensitive(ui_flashbtn, FALSE); -} diff --git a/sw/programmer/linux/src/ui.h b/sw/programmer/linux/src/ui.h deleted file mode 100644 index 510537a..0000000 --- a/sw/programmer/linux/src/ui.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef __Z80PROG_UI_H__ -#define __Z80PROG_UI_H_ - -#include "flash.h" - -#include -#include - -#include - -#define UI_LOG_ERR "[!] " -#define UI_LOG_WARN "[#] " -#define UI_LOG_MSG "[@] " - -void ui_init(int *argc, char **argv[]); -void ui_log(const char *msg); -void ui_check_enable_flashbtn(void); - -void ui_file_set(GtkFileChooserButton *btn, gpointer user_data); -void ui_connect_clicked(void); -void ui_disconnect_clicked(void); -void ui_flash_clicked(void); - -#endif diff --git a/sw/programmer/linux/src/z80prog b/sw/programmer/linux/src/z80prog deleted file mode 100755 index e2876ee..0000000 Binary files a/sw/programmer/linux/src/z80prog and /dev/null differ diff --git a/sw/programmer/linux/src/z80prog.ui b/sw/programmer/linux/src/z80prog.ui deleted file mode 100644 index 6c652ec..0000000 --- a/sw/programmer/linux/src/z80prog.ui +++ /dev/null @@ -1,223 +0,0 @@ - - - - - - 1000000 - 9600 - 1 - 10 - - - - *.bin - *.gb - *.gba - *.gbc - *.hex - - - - 450 - 250 - True - False - Z80 ROM Programmer - 450 - 200 - - - True - False - 10 - 10 - 10 - 10 - vertical - 10 - - - True - False - 10 - - - True - True - /dev/tty - Enter device path - - - True - True - 0 - - - - - True - True - 0 - 7 - True - 1200 - number - baudrateadjust - 10 - True - True - if-valid - 1200 - - - False - True - 1 - - - - - gtk-connect - True - True - True - True - - - False - True - 2 - - - - - False - True - 0 - - - - - True - False - 10 - - - True - True - Enter binary path - - - True - True - 0 - - - - - True - False - gbbinfilter - - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - vertical - 10 - - - True - False - True - start - - - True - True - 0 - - - - - Flash - True - False - True - True - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - - - True - True - True - True - True - - - True - True - in - - - True - True - True - True - False - True - - - - - - - True - False - Logs - - - - - - - True - True - 3 - - - - - - -- cgit v1.2.1