Oops - fix broken SPI driver due to missing bit inversion on a port mask.

[pub/USBasp.git] / LUFA / Scheduler / Scheduler.c

diff --git a/LUFA/Scheduler/Scheduler.c b/LUFA/Scheduler/Scheduler.c
index 11ba5cc..6ef1c4d 100644 (file)
--- a/LUFA/Scheduler/Scheduler.c
+++ b/LUFA/Scheduler/Scheduler.c
@@ -1,7 +1,7 @@
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.
 /*
              LUFA Library
      Copyright (C) Dean Camera, 2010.

-              
+

   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */
   dean [at] fourwalledcubicle [dot] com
       www.fourwalledcubicle.com
 */


@@ -9,13 +9,13 @@
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 
 /*
   Copyright 2010  Dean Camera (dean [at] fourwalledcubicle [dot] com)
 

-  Permission to use, copy, modify, distribute, and sell this 
+  Permission to use, copy, modify, distribute, and sell this

   software and its documentation for any purpose is hereby granted
   software and its documentation for any purpose is hereby granted

-  without fee, provided that the above copyright notice appear in 
+  without fee, provided that the above copyright notice appear in

   all copies and that both that the copyright notice and this
   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 
+  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
   software without specific, written prior permission.
 
   The author disclaim all warranties with regard to this


@@ -33,18 +33,19 @@
 volatile SchedulerDelayCounter_t Scheduler_TickCounter;
 volatile uint8_t                 Scheduler_TotalTasks;
 
 volatile SchedulerDelayCounter_t Scheduler_TickCounter;
 volatile uint8_t                 Scheduler_TotalTasks;
 

-bool Scheduler_HasDelayElapsed(const uint16_t Delay, SchedulerDelayCounter_t* const DelayCounter)
+bool Scheduler_HasDelayElapsed(const uint16_t Delay,
+                               SchedulerDelayCounter_t* const DelayCounter)

 {
        SchedulerDelayCounter_t CurrentTickValue_LCL;
        SchedulerDelayCounter_t DelayCounter_LCL;
 {
        SchedulerDelayCounter_t CurrentTickValue_LCL;
        SchedulerDelayCounter_t DelayCounter_LCL;

-       
+

        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                CurrentTickValue_LCL = Scheduler_TickCounter;
        }
        ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
        {
                CurrentTickValue_LCL = Scheduler_TickCounter;
        }

-       
+

        DelayCounter_LCL = *DelayCounter;
        DelayCounter_LCL = *DelayCounter;

-       
+

        if (CurrentTickValue_LCL >= DelayCounter_LCL)
        {
                if ((CurrentTickValue_LCL - DelayCounter_LCL) >= Delay)
        if (CurrentTickValue_LCL >= DelayCounter_LCL)
        {
                if ((CurrentTickValue_LCL - DelayCounter_LCL) >= Delay)


@@ -59,16 +60,17 @@ bool Scheduler_HasDelayElapsed(const uint16_t Delay, SchedulerDelayCounter_t* co
                {
                        *DelayCounter = CurrentTickValue_LCL;
                        return true;
                {
                        *DelayCounter = CurrentTickValue_LCL;
                        return true;

-               }       
+               }

        }
        }

-       
+

        return false;
 }
 
        return false;
 }
 

-void Scheduler_SetTaskMode(const TaskPtr_t Task, const bool TaskStatus)
+void Scheduler_SetTaskMode(const TaskPtr_t Task,
+                           const bool TaskStatus)

 {
        TaskEntry_t* CurrTask = &Scheduler_TaskList[0];
 {
        TaskEntry_t* CurrTask = &Scheduler_TaskList[0];

-                                       
+

        while (CurrTask != &Scheduler_TaskList[Scheduler_TotalTasks])
        {
                if (CurrTask->Task == Task)
        while (CurrTask != &Scheduler_TaskList[Scheduler_TotalTasks])
        {
                if (CurrTask->Task == Task)


@@ -76,20 +78,22 @@ void Scheduler_SetTaskMode(const TaskPtr_t Task, const bool TaskStatus)
                        CurrTask->TaskStatus = TaskStatus;
                        break;
                }
                        CurrTask->TaskStatus = TaskStatus;
                        break;
                }

-               
+

                CurrTask++;
        }
 }
 
                CurrTask++;
        }
 }
 

-void Scheduler_SetGroupTaskMode(const uint8_t GroupID, const bool TaskStatus)
+void Scheduler_SetGroupTaskMode(const uint8_t GroupID,
+                                const bool TaskStatus)

 {
        TaskEntry_t* CurrTask = &Scheduler_TaskList[0];
 {
        TaskEntry_t* CurrTask = &Scheduler_TaskList[0];

-                                       
+

        while (CurrTask != &Scheduler_TaskList[Scheduler_TotalTasks])
        {
                if (CurrTask->GroupID == GroupID)
                  CurrTask->TaskStatus = TaskStatus;
        while (CurrTask != &Scheduler_TaskList[Scheduler_TotalTasks])
        {
                if (CurrTask->GroupID == GroupID)
                  CurrTask->TaskStatus = TaskStatus;

-               
+

                CurrTask++;
        }
 }
                CurrTask++;
        }
 }

+