drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Add conditional compile for MOUSE_ENABLE and EXTRAKEY_ENABLE.

Browse source
This commit is contained in:
tmk 2012-06-29 03:33:59 +09:00
parent 52011f08c9
commit f2ebac101d
4 changed files with 105 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

32
protocol/lufa/lufa.c
View file

@ -50,7 +50,9 @@ static uint8_t keyboard_led_stats = 0;
// TODO: impl Control Request GET_REPORT
static report_keyboard_t keyboard_report_sent;
#ifdef MOUSE_ENABLE
static report_mouse_t mouse_report_sent;
#endif
/* Host driver */
static uint8_t keyboard_leds(void);
@ -171,19 +173,23 @@ void EVENT_USB_Device_ConfigurationChanged(void)
ConfigSuccess &= Endpoint_ConfigureEndpoint(KEYBOARD_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
KEYBOARD_EPSIZE, ENDPOINT_BANK_SINGLE);
#ifdef MOUSE_ENABLE
/* Setup Mouse HID Report Endpoint */
ConfigSuccess &= Endpoint_ConfigureEndpoint(MOUSE_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
MOUSE_EPSIZE, ENDPOINT_BANK_SINGLE);
#endif
#ifdef EXTRAKEY_ENABLE
/* Setup Extra HID Report Endpoint */
ConfigSuccess &= Endpoint_ConfigureEndpoint(EXTRA_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
EXTRA_EPSIZE, ENDPOINT_BANK_SINGLE);
#endif
/* Setup Console HID Report Endpoints */
ConfigSuccess &= Endpoint_ConfigureEndpoint(CONSOLE_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE);
ConfigSuccess &= Endpoint_ConfigureEndpoint(CONSOLE_OUT_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_OUT,
CONSOLE_EPSIZE, ENDPOINT_BANK_SINGLE);
/* Setup Extra HID Report Endpoint */
ConfigSuccess &= Endpoint_ConfigureEndpoint(EXTRA_IN_EPNUM, EP_TYPE_INTERRUPT, ENDPOINT_DIR_IN,
EXTRA_EPSIZE, ENDPOINT_BANK_SINGLE);
}
/*
@ -222,15 +228,19 @@ void EVENT_USB_Device_ControlRequest(void)
ReportData = (uint8_t*)&keyboard_report_sent;
ReportSize = sizeof(keyboard_report_sent);
break;
#ifdef MOUSE_ENABLE
case MOUSE_INTERFACE:
// TODO: test/check
ReportData = (uint8_t*)&mouse_report_sent;
ReportSize = sizeof(mouse_report_sent);
break;
case CONSOLE_INTERFACE:
break;
#endif
#ifdef EXTRAKEY_ENABLE
case EXTRA_INTERFACE:
break;
#endif
case CONSOLE_INTERFACE:
break;
}
/* Write the report data to the control endpoint */
@ -258,12 +268,16 @@ void EVENT_USB_Device_ControlRequest(void)
/* Read in the LED report from the host */
keyboard_led_stats = Endpoint_Read_8();
break;
#ifdef MOUSE_ENABLE
case MOUSE_INTERFACE:
break;
case CONSOLE_INTERFACE:
break;
#endif
#ifdef EXTRAKEY_ENABLE
case EXTRA_INTERFACE:
break;
#endif
case CONSOLE_INTERFACE:
break;
}
Endpoint_ClearOUT();
@ -302,6 +316,7 @@ static void send_keyboard(report_keyboard_t *report)
static void send_mouse(report_mouse_t *report)
{
#ifdef MOUSE_ENABLE
/* Select the Mouse Report Endpoint */
Endpoint_SelectEndpoint(MOUSE_IN_EPNUM);
@ -315,6 +330,7 @@ static void send_mouse(report_mouse_t *report)
Endpoint_ClearIN();
}
mouse_report_sent = *report;
#endif
}
typedef struct {