X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=ROM2%2Fxmodem.c;h=d0e09dd0a04bc57a235f4d0ee89b884167ecee8f;hb=HEAD;hp=3aa776a6b795694e4cdebd2511a46dbbff44338c;hpb=77e73f29dba77e76df09c5b93f61a446e1fd8714;p=uccvend-snackrom.git

diff --git a/ROM2/xmodem.c b/ROM2/xmodem.c
index 3aa776a..d0e09dd 100644
--- a/ROM2/xmodem.c
+++ b/ROM2/xmodem.c
@@ -53,17 +53,18 @@ readchar (int timeout)
 }
 
 /* Calculate a CRC-16 for the LEN byte message pointed at by P.  */
-/* Pads with ^Z if necessary */
+/* Pads with ^Z up to 128 bytes if told to */
 
-static unsigned short
-docrc (unsigned char *p, int len)
+unsigned short
+docrc (unsigned char *p, short len, bool pad, unsigned short crc)
 {
-  int len2 = len;
-  unsigned short crc = 0;
+  short len2 = len;
 
-  while (len-- > 0)
-    crc = (crc << 8) ^ crctab[(crc >> 8) ^ *p++];
-  if (len2 < 128) {
+  while (len-- > 0) {
+    crc = (crc << 8) ^ (crctab[(crc >> 8) ^ *p]);
+	p++;
+  }
+  if (pad && len2 < 128) {
     len = 128-len;
     while (len-- > 0)
       crc = (crc << 8) ^ crctab[(crc >> 8) ^ 0x1a];
@@ -162,7 +163,7 @@ xmodem_send_packet (const unsigned char *packet, int len)
     if (crcflag) {
       u16 crc;
 
-      crc = docrc ((unsigned char*)packet, len);
+      crc = docrc ((unsigned char*)packet, len, 1, 0);
 
       s[0] = crc >> 8;
       s[1] = crc & 0xff;