From ebb574642e6b75bb2f2605428792a28a0b5a86f1 Mon Sep 17 00:00:00 2001
From: jonnosan <jonnosan@93682198-c243-4bdb-bd91-e943c89aac3b>
Date: Sun, 31 Jan 2010 06:50:18 +0000
Subject: [PATCH] git-svn-id: http://svn.code.sf.net/p/netboot65/code@249
 93682198-c243-4bdb-bd91-e943c89aac3b

---
 client/ip65/xmodem.s | 9 ++++++++-
 doc/CHANGES.txt      | 3 +++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/client/ip65/xmodem.s b/client/ip65/xmodem.s
index c2c67ae..c71b6bf 100644
--- a/client/ip65/xmodem.s
+++ b/client/ip65/xmodem.s
@@ -327,10 +327,17 @@ xmodem_receive:
   beq @got_soh
   cmp #SOH
   beq @got_soh
-  jsr print_hex
   lda #'!'  ;we got an unexpected character
   jsr print_a
+  jsr print_hex
+  ;we need to clear the input buffer
+@clear_input_buffer:  
+  lda #'!'  ;we got an unexpected character
   jsr print_a
+  lda #1
+  jsr getc
+  bcc @clear_input_buffer  
+  
 
   jmp @wait_for_block_start
 @got_soh:
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 92eb7dc..ed1dcad 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -1,3 +1,6 @@
+v1.0.29
+- FIX: XMODEM didn't recover if remote end tried to use 1K blocks
+
 v1.0.28
 - CHANGE: after playing a SID, go back to last viewed dir listing, not main menu
 - FIX: PETSCII mode telnet was broken