X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/51566d1a811f43dc39f38cb597de44ba9363d974..e652cfac67ace9c307612cd2e1df70142358c673:/Bootloaders/CDC/BootloaderCDC.c diff --git a/Bootloaders/CDC/BootloaderCDC.c b/Bootloaders/CDC/BootloaderCDC.c index f66602387..83fd0ee92 100644 --- a/Bootloaders/CDC/BootloaderCDC.c +++ b/Bootloaders/CDC/BootloaderCDC.c @@ -1,21 +1,21 @@ /* LUFA Library - Copyright (C) Dean Camera, 2009. + Copyright (C) Dean Camera, 2010. dean [at] fourwalledcubicle [dot] com www.fourwalledcubicle.com */ /* - Copyright 2009 Dean Camera (dean [at] fourwalledcubicle [dot] com) - - Permission to use, copy, modify, and distribute this software - and its documentation for any purpose and without fee is hereby - granted, provided that the above copyright notice appear in all - copies and that both that the copyright notice and this - permission notice and warranty disclaimer appear in supporting - documentation, and that the name of the author not be used in - advertising or publicity pertaining to distribution of the + Copyright 2010 Dean Camera (dean [at] fourwalledcubicle [dot] com) + + Permission to use, copy, modify, distribute, and sell this + software and its documentation for any purpose is hereby granted + without fee, provided that the above copyright notice appear in + all copies and that both that the copyright notice and this + permission notice and warranty disclaimer appear in supporting + documentation, and that the name of the author not be used in + advertising or publicity pertaining to distribution of the software without specific, written prior permission. The author disclaim all warranties with regard to this @@ -36,7 +36,6 @@ #define INCLUDE_FROM_BOOTLOADERCDC_C #include "BootloaderCDC.h" -/* Globals: */ /** Line coding options for the virtual serial port. Although the virtual serial port data is never * sent through a physical serial port, the line encoding data must still be read and preserved from * the host, or the host will detect a problem and fail to open the port. This structure contains the @@ -70,6 +69,9 @@ int main(void) /* Setup hardware required for the bootloader */ SetupHardware(); + /* Enable global interrupts so that the USB stack can function */ + sei(); + while (RunBootloader) { CDC_Task(); @@ -344,7 +346,7 @@ static void WriteNextResponseByte(const uint8_t Response) /* Select the IN endpoint so that the next data byte can be written */ Endpoint_SelectEndpoint(CDC_TX_EPNUM); - /* If IN endpoint full, clear it and wait util ready for the next packet to the host */ + /* If IN endpoint full, clear it and wait until ready for the next packet to the host */ if (!(Endpoint_IsReadWriteAllowed())) { Endpoint_ClearIN();