--- a/.hgignore	Thu Oct 27 05:11:05 2016 +0000
+++ b/.hgignore	Thu Oct 27 05:28:30 2016 +0000
@@ -11,6 +11,7 @@
 
 ^lcdemu/fc-lcdemu$
 
+^loadtools/fc-buzplay$
 ^loadtools/fc-compalram$
 ^loadtools/fc-iram$
 ^loadtools/fc-loadtool$

--- a/loadtools/Makefile	Thu Oct 27 05:11:05 2016 +0000
+++ b/loadtools/Makefile	Thu Oct 27 05:28:30 2016 +0000
@@ -1,6 +1,6 @@
 CC=	gcc
 CFLAGS=	-O2
-PROGS=	fc-iram fc-loadtool fc-xram fc-compalram
+PROGS=	fc-iram fc-loadtool fc-xram fc-compalram fc-buzplay
 INSTBIN=/opt/freecalypso/bin
 INSTCONF=/opt/freecalypso/loadtools
 INSTHELP=/opt/freecalypso/helpfiles
@@ -23,6 +23,10 @@
 		hexdecode.o hwparam.o initscript.o labaud.o romload.o sercomm.o\
 		srecreader.o tpinterf.o ttypassthru.o ${EXTRA_OBJ}
 
+BUZPLAY_OBJS=	bpdispatch.o bpmain.o defpath.o flashstubs.o hexdecode.o \
+		hwparam.o labaud.o ltexit.o ltpassthru.o romload.o sercomm.o \
+		srecreader.o tpinterf.o ${EXTRA_OBJ}
+
 all:	${PROGS}
 
 fc-compalram:	${COMPALRAM_OBJS}
@@ -37,6 +41,9 @@
 fc-xram:	${XRAM_OBJS}
 	${CC} ${CFLAGS} -o $@ ${XRAM_OBJS}
 
+fc-buzplay:	${BUZPLAY_OBJS}
+	${CC} ${CFLAGS} -o $@ ${BUZPLAY_OBJS}
+
 install:
 	mkdir -p ${INSTBIN}
 	install -c ${PROGS} ${INSTBIN}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/loadtools/bpdispatch.c	Thu Oct 27 05:28:30 2016 +0000
@@ -0,0 +1,80 @@
+/*
+ * This module implements the command dispatch for fc-buzplay
+ */
+
+#include <ctype.h>
+#include <stdio.h>
+#include <string.h>
+#include <strings.h>
+#include <stdlib.h>
+
+extern int cmd_baud();
+extern int cmd_exit();
+extern int loadtool_cmd_passthru();
+
+static struct cmdtab {
+	char *cmd;
+	int minargs;
+	int maxargs;
+	int (*func)();
+} cmdtab[] = {
+	{"abbr", 2, 2, loadtool_cmd_passthru},
+	{"abbw", 3, 3, loadtool_cmd_passthru},
+	{"baud", 0, 1, cmd_baud},
+	{"buzlev", 0, 1, loadtool_cmd_passthru},
+	{"exit", 0, 1, cmd_exit},
+	{"quit", 0, 1, cmd_exit},
+	{"r8", 1, 1, loadtool_cmd_passthru},
+	{"r16", 1, 1, loadtool_cmd_passthru},
+	{"r32", 1, 1, loadtool_cmd_passthru},
+	{"w8", 2, 2, loadtool_cmd_passthru},
+	{"w16", 2, 2, loadtool_cmd_passthru},
+	{"w32", 2, 2, loadtool_cmd_passthru},
+	{0, 0, 0, 0}
+};
+
+buzplay_dispatch_cmd(cmd)
+	char *cmd;
+{
+	char *argv[10];
+	char *cp, **ap;
+	struct cmdtab *tp;
+
+	for (cp = cmd; isspace(*cp); cp++)
+		;
+	if (!*cp || *cp == '#')
+		return(0);
+	argv[0] = cp;
+	while (*cp && !isspace(*cp))
+		cp++;
+	if (*cp)
+		*cp++ = '\0';
+	for (tp = cmdtab; tp->cmd; tp++)
+		if (!strcmp(tp->cmd, argv[0]))
+			break;
+	if (!tp->func) {
+		fprintf(stderr, "error: no such command\n");
+		return(-1);
+	}
+	for (ap = argv + 1; ; ) {
+		while (isspace(*cp))
+			cp++;
+		if (!*cp || *cp == '#')
+			break;
+		if (ap - argv - 1 >= tp->maxargs) {
+			fprintf(stderr, "error: too many arguments\n");
+			return(-1);
+		}
+		*ap++ = cp;
+		while (*cp && !isspace(*cp))
+			cp++;
+		if (*cp)
+			*cp++ = '\0';
+	}
+	if (ap - argv - 1 < tp->minargs) {
+		fprintf(stderr, "error: too few arguments\n");
+		return(-1);
+	}
+	*ap = 0;
+	return tp->func(ap - argv, argv);
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/loadtools/bpmain.c	Thu Oct 27 05:28:30 2016 +0000
@@ -0,0 +1,93 @@
+/*
+ * This module contains the main() function for fc-buzplay
+ */
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include "srecreader.h"
+
+extern char *target_ttydev;
+extern struct srecreader iramimage;
+extern char default_buzplayer_image[];
+extern void (*default_exit)();
+extern int gta_modem_poweron;
+
+extern struct baudrate *find_baudrate_by_name();
+
+static struct baudrate *reattach;
+
+main(argc, argv)
+	char **argv;
+{
+	extern char *optarg;
+	extern int optind;
+	int c;
+	char command[512];
+
+	while ((c = getopt(argc, argv, "a:b:c:C:h:H:i:nr:")) != EOF)
+		switch (c) {
+		case 'a':
+			iramimage.filename = optarg;
+			continue;
+		case 'b':
+			set_romload_baudrate(optarg);
+			continue;
+		case 'c':
+			set_compalstage_short(optarg);
+			continue;
+		case 'C':
+			set_compalstage_fullpath(optarg);
+			continue;
+		case 'h':
+			read_hwparam_file_shortname(optarg);
+			continue;
+		case 'H':
+			read_hwparam_file_fullpath(optarg);
+			continue;
+		case 'i':
+			set_beacon_interval(optarg);
+			continue;
+		case 'n':
+			gta_modem_poweron = 0;
+			continue;
+		case 'r':
+			reattach = find_baudrate_by_name(optarg);
+			if (!reattach)
+				exit(1);	/* error msg already printed */
+			continue;
+		case '?':
+		default:
+usage:			fprintf(stderr,
+				"usage: fc-buzplay [options] ttyport\n");
+			exit(1);
+		}
+	if (argc - optind != 1)
+		goto usage;
+	target_ttydev = argv[optind];
+	if (!iramimage.filename)
+		iramimage.filename = default_buzplayer_image;
+
+	open_target_serial();
+	if (reattach)
+		switch_baud_rate(reattach);
+	else {
+		perform_compal_stage(1);
+		perform_romload();
+		putchar('\n');
+		if (tpinterf_pass_output(1) < 0)
+			exit(1);
+		putchar('\n');
+	}
+	for (;;) {
+		if (isatty(0)) {
+			fputs("buzplay> ", stdout);
+			fflush(stdout);
+		}
+		if (!fgets(command, sizeof command, stdin))
+			default_exit();
+		buzplay_dispatch_cmd(command);
+	}
+}

--- a/loadtools/defpath.c	Thu Oct 27 05:11:05 2016 +0000
+++ b/loadtools/defpath.c	Thu Oct 27 05:28:30 2016 +0000
@@ -7,4 +7,5 @@
 char default_helpers_dir[] = "/opt/freecalypso/loadtools";
 char default_compalstage_dir[] = "/opt/freecalypso/target-bin";
 char default_loadagent_image[] = "/opt/freecalypso/target-bin/loadagent.srec";
+char default_buzplayer_image[] = "/opt/freecalypso/target-bin/buzplayer.srec";
 char loadtool_help_file[] = "/opt/freecalypso/helpfiles/loadtool.help";