X-Git-Url: http://git.linex4red.de/pub/USBasp.git/blobdiff_plain/292fc9b65eba6b874dd4c29087cf499123f8bd0c..53eca61d02f296262011b802e80f145329ace34b:/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c?ds=inline diff --git a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c index f2789c4a7..e7b0ad8bd 100644 --- a/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.c +++ b/Demos/Device/Incomplete/Sideshow/Lib/SideshowApplications.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 @@ -33,19 +33,6 @@ SideShow_Application_t InstalledApplications[MAX_APPLICATIONS]; -uint8_t SideShow_GetTotalApplications(void) -{ - uint8_t TotalInstalledApps = 0; - - for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++) - { - if (InstalledApplications[App].InUse) - TotalInstalledApps++; - } - - return TotalInstalledApps; -} - SideShow_Application_t* SideShow_GetFreeApplication(void) { for (uint8_t App = 0; App < ARRAY_ELEMENTS(InstalledApplications); App++) @@ -63,7 +50,7 @@ SideShow_Application_t* SideShow_GetApplicationFromGUID(GUID_t* GUID) { if (InstalledApplications[App].InUse) { - if (memcmp(&InstalledApplications[App].ApplicationID, GUID, sizeof(GUID_t)) == 0) + if (GUID_COMPARE(&InstalledApplications[App].ApplicationID, GUID)) return &InstalledApplications[App]; } }