di0ib
/
controller
关注 1
点赞 0
派生 0
代码 版本发布 0 动态
浏览代码

Revert "Merge pull request #27 from smasher816/wakeup-devel" 

This reverts commit 622ea5d85f94be4b1694fdf08e30fa76eeb18fe4, reversing
changes made to c21439cb48.
connect
Jacob Alexander 9 年前
父节点
216b151302
当前提交
6c67bc77bc
共有 3 个文件被更改，包括 1 次插入 和 27 次删除
合并视图 显示文件统计
  1. 1
    18
      Output/pjrcUSB/arm/usb_dev.c
  2. 0
    2
      Output/pjrcUSB/arm/usb_dev.h
  3. 0
    7
      Output/pjrcUSB/arm/usb_keyboard.c

+ 1
- 18
Output/pjrcUSB/arm/usb_dev.c 查看文件



static uint8_t reply_buffer[8]; static uint8_t reply_buffer[8];


volatile uint8_t remote_wakeup_enabled = 0;




// ----- Functions ----- // ----- Functions -----
data = reply_buffer; data = reply_buffer;
break; break;
case 0x0080: // GET_STATUS (device) case 0x0080: // GET_STATUS (device)
//I think this is the corrent endianess
reply_buffer[0] = (remote_wakeup_enabled)<<1;
reply_buffer[0] = 0;
reply_buffer[1] = 0; reply_buffer[1] = 0;
datalen = 2; datalen = 2;
data = reply_buffer; data = reply_buffer;
datalen = 2; datalen = 2;
break; break;
case 0x0100: // CLEAR_FEATURE (device) case 0x0100: // CLEAR_FEATURE (device)
//Disable DEVICE_REMOTE_WAKEUP feature
if (setup.wValue == 0x01) {
remote_wakeup_enabled = 0;
}
break;
case 0x0101: // CLEAR_FEATURE (interface) case 0x0101: // CLEAR_FEATURE (interface)
// TODO: Currently ignoring, perhaps useful? -HaaTa // TODO: Currently ignoring, perhaps useful? -HaaTa
endpoint0_stall(); endpoint0_stall();
endpoint0_stall(); endpoint0_stall();
return; return;
case 0x0300: // SET_FEATURE (device) case 0x0300: // SET_FEATURE (device)
//Enable DEVICE_REMOTE_WAKEUP feature
if (setup.wValue == 0x01) {
remote_wakeup_enabled = 1;
}
break;
case 0x0301: // SET_FEATURE (interface) case 0x0301: // SET_FEATURE (interface)
// TODO: Currently ignoring, perhaps useful? -HaaTa // TODO: Currently ignoring, perhaps useful? -HaaTa
endpoint0_stall(); endpoint0_stall();
//serial_print("sleep\n"); //serial_print("sleep\n");
USB0_ISTAT = USB_ISTAT_SLEEP; USB0_ISTAT = USB_ISTAT_SLEEP;
} }

if ( (status & USB_ISTAT_RESUME /* 20 */ ) ) {
//serial_print("resume\n");
USB0_ISTAT = USB_ISTAT_RESUME;
}
} }





+ 0
- 2
Output/pjrcUSB/arm/usb_dev.h 查看文件

extern volatile uint8_t usb_cdc_line_rtsdtr; extern volatile uint8_t usb_cdc_line_rtsdtr;
extern volatile uint8_t usb_cdc_transmit_flush_timer; extern volatile uint8_t usb_cdc_transmit_flush_timer;


extern volatile uint8_t remote_wakeup_enabled;





// ----- Functions ----- // ----- Functions -----

+ 0
- 7
Output/pjrcUSB/arm/usb_keyboard.c 查看文件

uint32_t wait_count = 0; uint32_t wait_count = 0;
usb_packet_t *tx_packet; usb_packet_t *tx_packet;


if (remote_wakeup_enabled) {
USB0_CTL |= USB_CTL_RESUME;
_delay_ms(5); //wait 1 to 15ms
USB0_CTL &= ~USB_CTL_RESUME;
_delay_ms(5);
}

// Wait till ready // Wait till ready
while ( 1 ) while ( 1 )
{ {