diff --git a/converter/pc98_usb/config.h b/converter/pc98_usb/config.h index 04ee5b1101..4f91c07ce4 100644 --- a/converter/pc98_usb/config.h +++ b/converter/pc98_usb/config.h @@ -69,11 +69,7 @@ along with this program. If not, see . #define SERIAL_SOFT_RXD_PORT PORTD #define SERIAL_SOFT_RXD_PIN PIND #define SERIAL_SOFT_RXD_BIT 2 -#ifdef SERIAL_SOFT_LOGIC_NEGATIVE - #define SERIAL_SOFT_RXD_READ() ~(SERIAL_SOFT_RXD_PIN&(1<. #define SERIAL_SOFT_TXD_PORT PORTD #define SERIAL_SOFT_TXD_PIN PIND #define SERIAL_SOFT_TXD_BIT 3 -#ifdef SERIAL_SOFT_LOGIC_NEGATIVE - #define SERIAL_SOFT_TXD_ON() do { \ - SERIAL_SOFT_TXD_PORT &= ~(1<. * asynchronous, negative logic, 1200baud, no flow control * 1-start bit, 8-data bit, non parity, 1-stop bit */ -#define SERIAL_BAUD 1200 - -#define SERIAL_RXD_DDR DDRD -#define SERIAL_RXD_PORT PORTD -#define SERIAL_RXD_PIN PIND -#define SERIAL_RXD_BIT 2 -#define SERIAL_RXD_VECT INT2_vect -#define SERIAL_RXD_INIT() do { \ +#define SERIAL_SOFT_BAUD 1200 +#define SERIAL_SOFT_PARITY_NONE +#define SERIAL_SOFT_BIT_ORDER_LSB +#define SERIAL_SOFT_LOGIC_NEGATIVE +/* RXD Port */ +#define SERIAL_SOFT_RXD_ENABLE +#define SERIAL_SOFT_RXD_DDR DDRD +#define SERIAL_SOFT_RXD_PORT PORTD +#define SERIAL_SOFT_RXD_PIN PIND +#define SERIAL_SOFT_RXD_BIT 2 +#define SERIAL_SOFT_RXD_VECT INT2_vect +/* RXD Interupt */ +#define SERIAL_SOFT_RXD_INIT() do { \ /* pin configuration: input with pull-up */ \ - SERIAL_RXD_DDR &= ~(1<>= 1; #else mask <<= 1; #endif } -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) /* to center of parity bit */ - if (parity) { - SERIAL_TXD_ON(); + if (parity != SERIAL_SOFT_PARITY_VAL) { + SERIAL_SOFT_TXD_ON(); } else { - SERIAL_TXD_OFF(); + SERIAL_SOFT_TXD_OFF(); } - _delay_us(WAIT_US-2); + _delay_us(WAIT_US); #endif /* stop bit */ - SERIAL_TXD_ON(); - _delay_us(WAIT_US-2); + SERIAL_SOFT_TXD_ON(); + _delay_us(WAIT_US); } /* detect edge of start bit */ -ISR(SERIAL_RXD_VECT) +ISR(SERIAL_SOFT_RXD_VECT) { - SERIAL_SOFT_DEBUG_TGL() - SERIAL_RXD_INT_ENTER() + SERIAL_SOFT_DEBUG_TGL(); + SERIAL_SOFT_RXD_INT_ENTER() uint8_t data = 0; -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB uint8_t mask = 0x80; #else uint8_t mask = 0x01; #endif -#ifdef SERIAL_PARITY_ODD uint8_t parity = 0; -#elif defined(SERIAL_PARITY_EVEN) - uint8_t parity = 1; -#endif /* to center of start bit */ _delay_us(WAIT_US/2); - SERIAL_SOFT_DEBUG_TGL() + SERIAL_SOFT_DEBUG_TGL(); do { /* to center of next bit */ _delay_us(WAIT_US); - SERIAL_SOFT_DEBUG_TGL() - if (SERIAL_RXD_READ()) { + SERIAL_SOFT_DEBUG_TGL(); + if (SERIAL_SOFT_RXD_IN()) { data |= mask; -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) parity ^= 1; -#endif } -#ifdef SERIAL_BIT_ORDER_MSB +#ifdef SERIAL_SOFT_BIT_ORDER_MSB mask >>= 1; #else mask <<= 1; #endif } while (mask); -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) /* to center of parity bit */ _delay_us(WAIT_US); - if (SERIAL_RXD_READ()) { parity ^= 1; } - SERIAL_SOFT_DEBUG_TGL() + if (SERIAL_SOFT_RXD_IN()) { parity ^= 1; } + SERIAL_SOFT_DEBUG_TGL(); #endif /* to center of stop bit */ _delay_us(WAIT_US); uint8_t next = (rbuf_head + 1) % RBUF_SIZE; -#if defined(SERIAL_PARITY_EVEN) || defined(SERIAL_PARITY_ODD) - if (parity && next != rbuf_tail) { +#if defined(SERIAL_SOFT_PARITY_EVEN) || defined(SERIAL_SOFT_PARITY_ODD) + if ((parity == SERIAL_SOFT_PARITY_VAL) && next != rbuf_tail) { #else if (next != rbuf_tail) { #endif @@ -211,6 +219,6 @@ ISR(SERIAL_RXD_VECT) rbuf_head = next; } - SERIAL_RXD_INT_EXIT(); - SERIAL_SOFT_DEBUG_TGL() + SERIAL_SOFT_RXD_INT_EXIT(); + SERIAL_SOFT_DEBUG_TGL(); }