Kaynağa Gözat

Return when ready check loop is timeouted(Fix #115)

tags/v1.9
tmk 10 yıl önce
ebeveyn
işleme
a5d4a1f3e1
2 değiştirilmiş dosya ile 27 ekleme ve 13 silme
  1. 2
    2
      protocol/lufa/descriptor.c
  2. 25
    11
      protocol/lufa/lufa.c

+ 2
- 2
protocol/lufa/descriptor.c Dosyayı Görüntüle

.EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM),
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = MOUSE_EPSIZE, .EndpointSize = MOUSE_EPSIZE,
.PollingIntervalMS = 0x01
.PollingIntervalMS = 0x0A
}, },
#endif #endif


.EndpointAddress = (ENDPOINT_DIR_IN | EXTRAKEY_IN_EPNUM), .EndpointAddress = (ENDPOINT_DIR_IN | EXTRAKEY_IN_EPNUM),
.Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
.EndpointSize = EXTRAKEY_EPSIZE, .EndpointSize = EXTRAKEY_EPSIZE,
.PollingIntervalMS = 0x01
.PollingIntervalMS = 0x0A
}, },
#endif #endif



+ 25
- 11
protocol/lufa/lufa.c Dosyayı Görüntüle



static void send_keyboard(report_keyboard_t *report) static void send_keyboard(report_keyboard_t *report)
{ {
uint8_t timeout = 0;
uint8_t timeout = 255;


if (USB_DeviceState != DEVICE_STATE_Configured) if (USB_DeviceState != DEVICE_STATE_Configured)
return; return;
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
if (keyboard_nkro) { if (keyboard_nkro) {
Endpoint_SelectEndpoint(NKRO_IN_EPNUM); Endpoint_SelectEndpoint(NKRO_IN_EPNUM);

/* Check if write ready for a polling interval around 1ms */
while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(4);
if (!Endpoint_IsReadWriteAllowed()) return;
} }
else else
#endif #endif
{ {
Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM); Endpoint_SelectEndpoint(KEYBOARD_IN_EPNUM);
}


/* Check if Keyboard Endpoint Ready for Read/Write */
while (--timeout && !Endpoint_IsReadWriteAllowed()) ;
/* Check if write ready for a polling interval around 10ms */
while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
if (!Endpoint_IsReadWriteAllowed()) return;
}


/* Write Keyboard Report Data */ /* Write Keyboard Report Data */
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
static void send_mouse(report_mouse_t *report) static void send_mouse(report_mouse_t *report)
{ {
#ifdef MOUSE_ENABLE #ifdef MOUSE_ENABLE
uint8_t timeout = 0;
uint8_t timeout = 255;


if (USB_DeviceState != DEVICE_STATE_Configured) if (USB_DeviceState != DEVICE_STATE_Configured)
return; return;
/* Select the Mouse Report Endpoint */ /* Select the Mouse Report Endpoint */
Endpoint_SelectEndpoint(MOUSE_IN_EPNUM); Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);


/* Check if Mouse Endpoint Ready for Read/Write */
while (--timeout && !Endpoint_IsReadWriteAllowed()) ;
/* Check if write ready for a polling interval around 10ms */
while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
if (!Endpoint_IsReadWriteAllowed()) return;


/* Write Mouse Report Data */ /* Write Mouse Report Data */
Endpoint_Write_Stream_LE(report, sizeof(report_mouse_t), NULL); Endpoint_Write_Stream_LE(report, sizeof(report_mouse_t), NULL);


static void send_system(uint16_t data) static void send_system(uint16_t data)
{ {
uint8_t timeout = 0;
uint8_t timeout = 255;


if (USB_DeviceState != DEVICE_STATE_Configured) if (USB_DeviceState != DEVICE_STATE_Configured)
return; return;
.usage = data .usage = data
}; };
Endpoint_SelectEndpoint(EXTRAKEY_IN_EPNUM); Endpoint_SelectEndpoint(EXTRAKEY_IN_EPNUM);
while (--timeout && !Endpoint_IsReadWriteAllowed()) ;

/* Check if write ready for a polling interval around 10ms */
while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
if (!Endpoint_IsReadWriteAllowed()) return;

Endpoint_Write_Stream_LE(&r, sizeof(report_extra_t), NULL); Endpoint_Write_Stream_LE(&r, sizeof(report_extra_t), NULL);
Endpoint_ClearIN(); Endpoint_ClearIN();
} }


static void send_consumer(uint16_t data) static void send_consumer(uint16_t data)
{ {
uint8_t timeout = 0;
uint8_t timeout = 255;


if (USB_DeviceState != DEVICE_STATE_Configured) if (USB_DeviceState != DEVICE_STATE_Configured)
return; return;
.usage = data .usage = data
}; };
Endpoint_SelectEndpoint(EXTRAKEY_IN_EPNUM); Endpoint_SelectEndpoint(EXTRAKEY_IN_EPNUM);
while (--timeout && !Endpoint_IsReadWriteAllowed()) ;

/* Check if write ready for a polling interval around 10ms */
while (timeout-- && !Endpoint_IsReadWriteAllowed()) _delay_us(40);
if (!Endpoint_IsReadWriteAllowed()) return;

Endpoint_Write_Stream_LE(&r, sizeof(report_extra_t), NULL); Endpoint_Write_Stream_LE(&r, sizeof(report_extra_t), NULL);
Endpoint_ClearIN(); Endpoint_ClearIN();
} }

Loading…
İptal
Kaydet