Macintosh-SW/mac-rom-simm-programmer
1
0
Fork 0
mirror of https://github.com/dougg3/mac-rom-simm-programmer.git synced 2024-11-29 06:49:20 +00:00
Code Issues Projects Releases Wiki Activity

Optimize reading of 1024 byte chunks

Browse Source 
This was a suggestion from bigmessowires. Do a tight loop when reading
a chunk of 1024 bytes. It's faster.
This commit is contained in:
Doug Brown 2020-11-25 16:30:57 -08:00 committed by Doug Brown
parent 3df4c40f38
commit 2943b80c42
3 changed files with 84 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hal/at90usb646/usbcdc_hw.h
View File

@ -27,12 +27,13 @@
#include "LUFA/Drivers/USB/USB.h" #include "LUFA/Drivers/USB/USB.h"
#include "cdc_device_definition.h" #include "cdc_device_definition.h"
#include "../../util.h"
/** Sends a byte over the USB CDC serial port /** Sends a byte over the USB CDC serial port
* *
* @param byte The byte to send * @param byte The byte to send
*/ */
static __attribute__((always_inline)) inline void USBCDC_SendByte(uint8_t byte) static ALWAYS_INLINE void USBCDC_SendByte(uint8_t byte)
{ {
CDC_Device_SendByte(&VirtualSerial_CDC_Interface, byte); CDC_Device_SendByte(&VirtualSerial_CDC_Interface, byte);
} }
@ -43,7 +44,7 @@ static __attribute__((always_inline)) inline void USBCDC_SendByte(uint8_t byte)
* @param len The number of bytes * @param len The number of bytes
* @return True on success, false on failure * @return True on success, false on failure
*/ */
static __attribute__((always_inline)) inline bool USBCDC_SendData(uint8_t const *data, uint16_t len) static ALWAYS_INLINE bool USBCDC_SendData(uint8_t const *data, uint16_t len)
{ {
return CDC_Device_SendData(&VirtualSerial_CDC_Interface, (char const *)data, len) == ENDPOINT_RWSTREAM_NoError; return CDC_Device_SendData(&VirtualSerial_CDC_Interface, (char const *)data, len) == ENDPOINT_RWSTREAM_NoError;
} }
@ -52,15 +53,29 @@ static __attribute__((always_inline)) inline bool USBCDC_SendData(uint8_t const
* *
* @return The byte read, or -1 if there are no bytes available * @return The byte read, or -1 if there are no bytes available
*/ */
static __attribute__((always_inline)) inline int16_t USBCDC_ReadByte(void) static ALWAYS_INLINE int16_t USBCDC_ReadByte(void)
{ {
return CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface); return CDC_Device_ReceiveByte(&VirtualSerial_CDC_Interface);
} }
/** Reads a byte from the USB CDC serial port. Blocks until one is available.
*
* @return The byte read
*/
static ALWAYS_INLINE uint8_t USBCDC_ReadByteBlocking(void)
{
int16_t b;
do
{
b = USBCDC_ReadByte();
} while (b < 0);
return (uint8_t)b;
}
/** Forces any transmitted data to be sent over USB immediately /** Forces any transmitted data to be sent over USB immediately
* *
*/ */
static __attribute__((always_inline)) inline void USBCDC_Flush(void) static ALWAYS_INLINE inline void USBCDC_Flush(void)
{ {
CDC_Device_Flush(&VirtualSerial_CDC_Interface); CDC_Device_Flush(&VirtualSerial_CDC_Interface);
} }

1
hal/usbcdc.h
View File

@ -36,6 +36,7 @@ void USBCDC_Check(void);
//void USBCDC_SendByte(uint8_t byte); //void USBCDC_SendByte(uint8_t byte);
//bool USBCDC_SendData(uint8_t const *data, uint16_t len); //bool USBCDC_SendData(uint8_t const *data, uint16_t len);
//int16_t USBCDC_ReadByte(void); //int16_t USBCDC_ReadByte(void);
//uint8_t USBCDC_ReadByteBlocking(void);
//void USBCDC_Flush(void) //void USBCDC_Flush(void)
#endif /* HAL_USBCDC_H_ */ #endif /* HAL_USBCDC_H_ */

8
simm_programmer.c
View File

@ -422,10 +422,13 @@ static void SIMMProgrammer_HandleWritingChipsByte(uint8_t byte)
} }
else // Interpret the incoming byte as data to write to the SIMM. else // Interpret the incoming byte as data to write to the SIMM.
{ {
// Save the byte, and check if we've filled up an entire chunk // Save the byte. Then, block until we receive the rest of the data.
writeChunks.bytes[writePosInChunk++] = byte; writeChunks.bytes[writePosInChunk++] = byte;
if (writePosInChunk >= READ_WRITE_CHUNK_SIZE_BYTES) while (writePosInChunk < READ_WRITE_CHUNK_SIZE_BYTES)
{ {
writeChunks.bytes[writePosInChunk++] = USBCDC_ReadByteBlocking();
}
// We filled up the chunk, write it out and confirm it, then wait // We filled up the chunk, write it out and confirm it, then wait
// for the next command from the computer! // for the next command from the computer!
if (chipsMask == ALL_CHIPS) if (chipsMask == ALL_CHIPS)
@ -499,7 +502,6 @@ static void SIMMProgrammer_HandleWritingChipsByte(uint8_t byte)
LED_Toggle(); LED_Toggle();
} }
} }
}
} }
/** Handler called during an electrical test when a short is detected /** Handler called during an electrical test when a short is detected