X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Output%2FpjrcUSB%2Farm%2Fusb_dev.h;h=827f843b6f75e9837fd0cb0a6d67b0be0f153440;hb=46765e85c57e19b89754f4f9c26c8f18b35148e5;hp=ddfc6f392c2534831e5da6ddaaaee14b48b4c5ed;hpb=88ace02e517950f3ec3eb71d9d0b7b51939d46f7;p=kiibohd-controller.git diff --git a/Output/pjrcUSB/arm/usb_dev.h b/Output/pjrcUSB/arm/usb_dev.h index ddfc6f3..827f843 100644 --- a/Output/pjrcUSB/arm/usb_dev.h +++ b/Output/pjrcUSB/arm/usb_dev.h @@ -1,7 +1,7 @@ /* Teensyduino Core Library * http://www.pjrc.com/teensy/ * Copyright (c) 2013 PJRC.COM, LLC. - * Modifications by Jacob Alexander 2014 + * Modifications by Jacob Alexander 2014-2015 * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -29,8 +29,7 @@ * SOFTWARE. */ -#ifndef _usb_dev_h_ -#define _usb_dev_h_ +#pragma once // ----- Includes ----- @@ -75,17 +74,14 @@ usb_packet_t *usb_rx( uint32_t endpoint ); static inline uint32_t usb_rx_byte_count(uint32_t endpoint) __attribute__((always_inline)); static inline uint32_t usb_rx_byte_count(uint32_t endpoint) { - endpoint--; - if ( endpoint >= NUM_ENDPOINTS ) + endpoint--; + if ( endpoint >= NUM_ENDPOINTS ) return 0; - return usb_rx_byte_count_data[ endpoint ]; + return usb_rx_byte_count_data[ endpoint ]; } void usb_device_reload(); +void usb_device_check(); extern void usb_serial_flush_callback(); - - -#endif -