diff options
Diffstat (limited to 'Projects')
-rw-r--r-- | Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c | 4 | ||||
-rw-r--r-- | Projects/AVRISP-MKII/Lib/V2ProtocolParams.c | 2 | ||||
-rw-r--r-- | Projects/Benito/Benito.c | 4 | ||||
-rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/DiskDevice.c | 1 | ||||
-rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/DiskHost.c | 1 | ||||
-rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c | 4 | ||||
-rw-r--r-- | Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c | 1 | ||||
-rw-r--r-- | Projects/MIDIToneGenerator/MIDIToneGenerator.c | 5 | ||||
-rw-r--r-- | Projects/Magstripe/Magstripe.c | 7 | ||||
-rw-r--r-- | Projects/MissileLauncher/MissileLauncher.c | 32 | ||||
-rw-r--r-- | Projects/MissileLauncher/MissileLauncher.h | 4 | ||||
-rw-r--r-- | Projects/TempDataLogger/Lib/SCSI.c | 4 | ||||
-rw-r--r-- | Projects/TempDataLogger/TempDataLogger.c | 12 | ||||
-rw-r--r-- | Projects/USBtoSerial/USBtoSerial.c | 10 | ||||
-rw-r--r-- | Projects/Webserver/Lib/SCSI.c | 4 | ||||
-rw-r--r-- | Projects/Webserver/Lib/uIPManagement.c | 10 | ||||
-rw-r--r-- | Projects/XPLAINBridge/Lib/SoftUART.c | 1 | ||||
-rw-r--r-- | Projects/XPLAINBridge/XPLAINBridge.c | 4 |
18 files changed, 59 insertions, 51 deletions
diff --git a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c index 7e8695503..373e19149 100644 --- a/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c +++ b/Projects/AVRISP-MKII/Lib/ISP/ISPTarget.c @@ -108,10 +108,10 @@ static uint16_t TimerCompareFromSCKDuration[] PROGMEM = bool HardwareSPIMode = true; /** Software SPI data register for sending and receiving */ -volatile uint8_t SoftSPI_Data; +static volatile uint8_t SoftSPI_Data; /** Number of bits left to transfer in the software SPI driver */ -volatile uint8_t SoftSPI_BitsRemaining; +static volatile uint8_t SoftSPI_BitsRemaining; /** ISR to handle software SPI transmission and reception */ diff --git a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c index 7a2c986ca..3c1a88130 100644 --- a/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c +++ b/Projects/AVRISP-MKII/Lib/V2ProtocolParams.c @@ -37,7 +37,7 @@ #include "V2ProtocolParams.h" /* Non-Volatile Parameter Values for EEPROM storage */ -uint8_t EEMEM EEPROM_Rest_Polarity = 0x00; +static uint8_t EEMEM EEPROM_Rest_Polarity = 0x00; /* Volatile Parameter Values for RAM storage */ static ParameterItem_t ParameterTable[] = diff --git a/Projects/Benito/Benito.c b/Projects/Benito/Benito.c index 26b5ad2b8..9db6a3f84 100644 --- a/Projects/Benito/Benito.c +++ b/Projects/Benito/Benito.c @@ -37,10 +37,10 @@ #include "Benito.h" /** Circular buffer to hold data from the serial port before it is sent to the host. */ -RingBuffer_t USARTtoUSB_Buffer; +static RingBuffer_t USARTtoUSB_Buffer; /** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */ -uint8_t USARTtoUSB_Buffer_Data[128]; +static uint8_t USARTtoUSB_Buffer_Data[128]; /** Pulse generation counters to keep track of the number of milliseconds remaining for each pulse type */ volatile struct diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskDevice.c b/Projects/Incomplete/StandaloneProgrammer/DiskDevice.c index 0eca0d799..8a8c97760 100644 --- a/Projects/Incomplete/StandaloneProgrammer/DiskDevice.c +++ b/Projects/Incomplete/StandaloneProgrammer/DiskDevice.c @@ -53,6 +53,7 @@ USB_ClassInfo_MS_Device_t DiskDevice_MS_Interface = }, }; + void DiskDevice_USBTask(void) { MS_Device_USBTask(&DiskDevice_MS_Interface); diff --git a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c index 9ba22542c..a0e2521c0 100644 --- a/Projects/Incomplete/StandaloneProgrammer/DiskHost.c +++ b/Projects/Incomplete/StandaloneProgrammer/DiskHost.c @@ -47,6 +47,7 @@ USB_ClassInfo_MS_Host_t DiskHost_MS_Interface = }, }; + void DiskHost_USBTask(void) { if (USB_HostState == HOST_STATE_Addressed) diff --git a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c index a221a2f6f..d36d88743 100644 --- a/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c +++ b/Projects/Incomplete/StandaloneProgrammer/Lib/SCSI.c @@ -42,7 +42,7 @@ /** Structure to hold the SCSI response data to a SCSI INQUIRY command. This gives information about the device's * features and capabilities. */ -SCSI_Inquiry_Response_t InquiryData = +static const SCSI_Inquiry_Response_t InquiryData = { .DeviceType = DEVICE_TYPE_BLOCK, .PeripheralQualifier = 0, @@ -74,7 +74,7 @@ SCSI_Inquiry_Response_t InquiryData = /** Structure to hold the sense data for the last issued SCSI command, which is returned to the host after a SCSI REQUEST SENSE * command is issued. This gives information on exactly why the last command failed to complete. */ -SCSI_Request_Sense_Response_t SenseData = +static SCSI_Request_Sense_Response_t SenseData = { .ResponseCode = 0x70, .AdditionalLength = 0x0A, diff --git a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c index 86007daa5..3f5d48b00 100644 --- a/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c +++ b/Projects/Incomplete/StandaloneProgrammer/StandaloneProgrammer.c @@ -43,6 +43,7 @@ FILE DiskStream = FDEV_SETUP_STREAM(NULL, Disk_getchar, _FDEV_SETUP_READ); /** Petite FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */ FATFS DiskFATState; + /** Stream character fetching routine for the FAT driver so that characters from the currently open file can be * read in sequence when applied to a stdio stream. */ diff --git a/Projects/MIDIToneGenerator/MIDIToneGenerator.c b/Projects/MIDIToneGenerator/MIDIToneGenerator.c index f9234865e..a4e2764c0 100644 --- a/Projects/MIDIToneGenerator/MIDIToneGenerator.c +++ b/Projects/MIDIToneGenerator/MIDIToneGenerator.c @@ -57,7 +57,7 @@ USB_ClassInfo_MIDI_Device_t Keyboard_MIDI_Interface = };
/** 8-bit 256 entry Sine Wave lookup table */
-const uint8_t SineTable[256] =
+static const uint8_t SineTable[256] =
{
128, 131, 134, 137, 140, 143, 146, 149, 152, 156, 159, 162, 165, 168, 171, 174,
176, 179, 182, 185, 188, 191, 193, 196, 199, 201, 204, 206, 209, 211, 213, 216,
@@ -78,7 +78,8 @@ const uint8_t SineTable[256] = };
/** Array of structures describing each note being generated */
-DDSNoteData NoteData[MAX_SIMULTANEOUS_NOTES];
+static DDSNoteData NoteData[MAX_SIMULTANEOUS_NOTES];
+
/** Main program entry point. This routine contains the overall program flow, including initial
* setup of all components and the main program loop.
diff --git a/Projects/Magstripe/Magstripe.c b/Projects/Magstripe/Magstripe.c index 2bb16145d..2b8fe2760 100644 --- a/Projects/Magstripe/Magstripe.c +++ b/Projects/Magstripe/Magstripe.c @@ -40,13 +40,13 @@ /** Bit buffers to hold the read bits for each of the three magnetic card tracks before they are transmitted * to the host as keyboard presses. */ -BitBuffer_t TrackDataBuffers[TOTAL_TRACKS]; +static BitBuffer_t TrackDataBuffers[TOTAL_TRACKS]; /** Pointer to the current track buffer being sent to the host. */ -BitBuffer_t* CurrentTrackBuffer = &TrackDataBuffers[TOTAL_TRACKS]; +static BitBuffer_t* CurrentTrackBuffer = &TrackDataBuffers[TOTAL_TRACKS]; /** Buffer to hold the previously generated Keyboard HID report, for comparison purposes inside the HID class driver. */ -uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)]; +static uint8_t PrevKeyboardHIDReportBuffer[sizeof(USB_KeyboardReport_Data_t)]; /** LUFA HID Class driver interface configuration and state information. This structure is * passed to all HID Class driver functions, so that multiple instances of the same class @@ -67,6 +67,7 @@ USB_ClassInfo_HID_Device_t Keyboard_HID_Interface = }, }; + /** Main program entry point. This routine contains the overall program flow, including initial * setup of all components and the main program loop. */ diff --git a/Projects/MissileLauncher/MissileLauncher.c b/Projects/MissileLauncher/MissileLauncher.c index b085ed54a..6a98b5459 100644 --- a/Projects/MissileLauncher/MissileLauncher.c +++ b/Projects/MissileLauncher/MissileLauncher.c @@ -46,46 +46,46 @@ #include "MissileLauncher.h" /** Launcher first init command report data sequence */ -uint8_t CMD_INITA[8] = { 85, 83, 66, 67, 0, 0, 4, 0 }; +static const uint8_t CMD_INITA[8] = { 85, 83, 66, 67, 0, 0, 4, 0 }; /** Launcher second init command report data sequence */ -uint8_t CMD_INITB[8] = { 85, 83, 66, 67, 0, 64, 2, 0 }; +static const uint8_t CMD_INITB[8] = { 85, 83, 66, 67, 0, 64, 2, 0 }; /** Launcher command report data sequence to stop all movement */ -uint8_t CMD_STOP[8] = { 0, 0, 0, 0, 0, 0, 8, 8 }; +static const uint8_t CMD_STOP[8] = { 0, 0, 0, 0, 0, 0, 8, 8 }; /** Launcher command report data sequence to move left */ -uint8_t CMD_LEFT[8] = { 0, 1, 0, 0, 0, 0, 8, 8 }; +static const uint8_t CMD_LEFT[8] = { 0, 1, 0, 0, 0, 0, 8, 8 }; /** Launcher command report data sequence to move right */ -uint8_t CMD_RIGHT[8] = { 0, 0, 1, 0, 0, 0, 8, 8 }; +static const uint8_t CMD_RIGHT[8] = { 0, 0, 1, 0, 0, 0, 8, 8 }; /** Launcher command report data sequence to move up */ -uint8_t CMD_UP[8] = { 0, 0, 0, 1, 0, 0, 8, 8 }; +static const uint8_t CMD_UP[8] = { 0, 0, 0, 1, 0, 0, 8, 8 }; /** Launcher command report data sequence to move down */ -uint8_t CMD_DOWN[8] = { 0, 0, 0, 0, 1, 0, 8, 8 }; +static const uint8_t CMD_DOWN[8] = { 0, 0, 0, 0, 1, 0, 8, 8 }; /** Launcher command report data sequence to move left and up */ -uint8_t CMD_LEFTUP[8] = { 0, 1, 0, 1, 0, 0, 8, 8 }; +static const uint8_t CMD_LEFTUP[8] = { 0, 1, 0, 1, 0, 0, 8, 8 }; /** Launcher command report data sequence to move right and up */ -uint8_t CMD_RIGHTUP[8] = { 0, 0, 1, 1, 0, 0, 8, 8 }; +static const uint8_t CMD_RIGHTUP[8] = { 0, 0, 1, 1, 0, 0, 8, 8 }; /** Launcher command report data sequence to move left and down */ -uint8_t CMD_LEFTDOWN[8] = { 0, 1, 0, 0, 1, 0, 8, 8 }; +static const uint8_t CMD_LEFTDOWN[8] = { 0, 1, 0, 0, 1, 0, 8, 8 }; /** Launcher command report data sequence to move right and down */ -uint8_t CMD_RIGHTDOWN[8] = { 0, 0, 1, 0, 1, 0, 8, 8 }; +static const uint8_t CMD_RIGHTDOWN[8] = { 0, 0, 1, 0, 1, 0, 8, 8 }; /** Launcher command report data sequence to fire a missile */ -uint8_t CMD_FIRE[8] = { 0, 0, 0, 0, 0, 1, 8, 8 }; +static const uint8_t CMD_FIRE[8] = { 0, 0, 0, 0, 0, 1, 8, 8 }; /** Last command sent to the launcher, to determine what new command (if any) must be sent */ -uint8_t* CmdState; +static const uint8_t* CmdState; /** Buffer to hold a command to send to the launcher */ -uint8_t CmdBuffer[LAUNCHER_CMD_BUFFER_SIZE]; +static uint8_t CmdBuffer[LAUNCHER_CMD_BUFFER_SIZE]; /** Main program entry point. This routine configures the hardware required by the application, then @@ -151,7 +151,7 @@ void Read_Joystick_Status(void) * \param[in] Report Report data to send. * \param[in] ReportSize Report length in bytes. */ -void Send_Command_Report(uint8_t* const Report, +void Send_Command_Report(const uint8_t* const Report, const uint16_t ReportSize) { memcpy(CmdBuffer, Report, 8); @@ -162,7 +162,7 @@ void Send_Command_Report(uint8_t* const Report, * * \param[in] Command One of the command constants. */ -void Send_Command(uint8_t* const Command) +void Send_Command(const uint8_t* const Command) { if ((CmdState == CMD_STOP && Command != CMD_STOP) || (CmdState != CMD_STOP && Command == CMD_STOP)) diff --git a/Projects/MissileLauncher/MissileLauncher.h b/Projects/MissileLauncher/MissileLauncher.h index d6cc63771..7363f0fab 100644 --- a/Projects/MissileLauncher/MissileLauncher.h +++ b/Projects/MissileLauncher/MissileLauncher.h @@ -73,9 +73,9 @@ void SetupHardware(void); void Read_Joystick_Status(void); - void Send_Command_Report(uint8_t* const Report, + void Send_Command_Report(const uint8_t* const Report, const uint16_t ReportSize); - void Send_Command(uint8_t* const Command); + void Send_Command(const uint8_t* const Command); void HID_Host_Task(void); diff --git a/Projects/TempDataLogger/Lib/SCSI.c b/Projects/TempDataLogger/Lib/SCSI.c index 31f62eef2..b317bce2a 100644 --- a/Projects/TempDataLogger/Lib/SCSI.c +++ b/Projects/TempDataLogger/Lib/SCSI.c @@ -41,7 +41,7 @@ /** Structure to hold the SCSI response data to a SCSI INQUIRY command. This gives information about the device's * features and capabilities. */ -SCSI_Inquiry_Response_t InquiryData = +static const SCSI_Inquiry_Response_t InquiryData = { .DeviceType = DEVICE_TYPE_BLOCK, .PeripheralQualifier = 0, @@ -73,7 +73,7 @@ SCSI_Inquiry_Response_t InquiryData = /** Structure to hold the sense data for the last issued SCSI command, which is returned to the host after a SCSI REQUEST SENSE * command is issued. This gives information on exactly why the last command failed to complete. */ -SCSI_Request_Sense_Response_t SenseData = +static SCSI_Request_Sense_Response_t SenseData = { .ResponseCode = 0x70, .AdditionalLength = 0x0A, diff --git a/Projects/TempDataLogger/TempDataLogger.c b/Projects/TempDataLogger/TempDataLogger.c index ec3902908..ecea2fb1a 100644 --- a/Projects/TempDataLogger/TempDataLogger.c +++ b/Projects/TempDataLogger/TempDataLogger.c @@ -59,7 +59,7 @@ USB_ClassInfo_MS_Device_t Disk_MS_Interface = }; /** Buffer to hold the previously generated HID report, for comparison purposes inside the HID class driver. */ -uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE]; +static uint8_t PrevHIDReportBuffer[GENERIC_REPORT_SIZE]; /** LUFA HID Class driver interface configuration and state information. This structure is * passed to all HID Class driver functions, so that multiple instances of the same class @@ -81,19 +81,19 @@ USB_ClassInfo_HID_Device_t Generic_HID_Interface = }; /** Non-volatile Logging Interval value in EEPROM, stored as a number of 500ms ticks */ -uint8_t EEMEM LoggingInterval500MS_EEPROM = DEFAULT_LOG_INTERVAL; +static uint8_t EEMEM LoggingInterval500MS_EEPROM = DEFAULT_LOG_INTERVAL; /** SRAM Logging Interval value fetched from EEPROM, stored as a number of 500ms ticks */ -uint8_t LoggingInterval500MS_SRAM; +static uint8_t LoggingInterval500MS_SRAM; /** Total number of 500ms logging ticks elapsed since the last log value was recorded */ -uint16_t CurrentLoggingTicks; +static uint16_t CurrentLoggingTicks; /** FAT Fs structure to hold the internal state of the FAT driver for the Dataflash contents. */ -FATFS DiskFATState; +static FATFS DiskFATState; /** FAT Fs structure to hold a FAT file handle for the log data write destination. */ -FIL TempLogFile; +static FIL TempLogFile; /** ISR to handle the 500ms ticks for sampling and data logging */ diff --git a/Projects/USBtoSerial/USBtoSerial.c b/Projects/USBtoSerial/USBtoSerial.c index 9ce00bf13..fe685d6e4 100644 --- a/Projects/USBtoSerial/USBtoSerial.c +++ b/Projects/USBtoSerial/USBtoSerial.c @@ -37,17 +37,16 @@ #include "USBtoSerial.h" /** Circular buffer to hold data from the host before it is sent to the device via the serial port. */ -RingBuffer_t USBtoUSART_Buffer; +static RingBuffer_t USBtoUSART_Buffer; /** Underlying data buffer for \ref USBtoUSART_Buffer, where the stored bytes are located. */ -uint8_t USBtoUSART_Buffer_Data[128]; +static uint8_t USBtoUSART_Buffer_Data[128]; /** Circular buffer to hold data from the serial port before it is sent to the host. */ -RingBuffer_t USARTtoUSB_Buffer; +static RingBuffer_t USARTtoUSB_Buffer; /** Underlying data buffer for \ref USARTtoUSB_Buffer, where the stored bytes are located. */ -uint8_t USARTtoUSB_Buffer_Data[128]; - +static uint8_t USARTtoUSB_Buffer_Data[128]; /** LUFA CDC Class driver interface configuration and state information. This structure is * passed to all CDC Class driver functions, so that multiple instances of the same class @@ -73,6 +72,7 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface = }, }; + /** Main program entry point. This routine contains the overall program flow, including initial * setup of all components and the main program loop. */ diff --git a/Projects/Webserver/Lib/SCSI.c b/Projects/Webserver/Lib/SCSI.c index 31f62eef2..b317bce2a 100644 --- a/Projects/Webserver/Lib/SCSI.c +++ b/Projects/Webserver/Lib/SCSI.c @@ -41,7 +41,7 @@ /** Structure to hold the SCSI response data to a SCSI INQUIRY command. This gives information about the device's * features and capabilities. */ -SCSI_Inquiry_Response_t InquiryData = +static const SCSI_Inquiry_Response_t InquiryData = { .DeviceType = DEVICE_TYPE_BLOCK, .PeripheralQualifier = 0, @@ -73,7 +73,7 @@ SCSI_Inquiry_Response_t InquiryData = /** Structure to hold the sense data for the last issued SCSI command, which is returned to the host after a SCSI REQUEST SENSE * command is issued. This gives information on exactly why the last command failed to complete. */ -SCSI_Request_Sense_Response_t SenseData = +static SCSI_Request_Sense_Response_t SenseData = { .ResponseCode = 0x70, .AdditionalLength = 0x0A, diff --git a/Projects/Webserver/Lib/uIPManagement.c b/Projects/Webserver/Lib/uIPManagement.c index dc1d23932..a99e8be93 100644 --- a/Projects/Webserver/Lib/uIPManagement.c +++ b/Projects/Webserver/Lib/uIPManagement.c @@ -38,17 +38,19 @@ #include "uIPManagement.h" /** Connection timer, to retain the time elapsed since the last time the uIP connections were managed. */ -struct timer ConnectionTimer; +static struct timer ConnectionTimer; /** ARP timer, to retain the time elapsed since the ARP cache was last updated. */ -struct timer ARPTimer; +static struct timer ARPTimer; -/** MAC address of the RNDIS device, when enumerated */ +/** MAC address of the RNDIS device, when enumerated. */ struct uip_eth_addr MACAddress; +/** Indicates if an IP configuration has been set in the device. */ bool HaveIPConfiguration; -/** Configures the uIP stack ready for network traffic. */ + +/** Configures the uIP stack ready for network traffic processing. */ void uIPManagement_Init(void) { /* uIP Timing Initialization */ diff --git a/Projects/XPLAINBridge/Lib/SoftUART.c b/Projects/XPLAINBridge/Lib/SoftUART.c index 1da223676..ddd983a91 100644 --- a/Projects/XPLAINBridge/Lib/SoftUART.c +++ b/Projects/XPLAINBridge/Lib/SoftUART.c @@ -51,6 +51,7 @@ static uint8_t RX_BitsRemaining; /** Temporary data variable to hold the byte being received as it is shifted in */ static uint8_t RX_Data; + /** Initialises the software UART, ready for data transmission and reception into the global ring buffers. */ void SoftUART_Init(void) { diff --git a/Projects/XPLAINBridge/XPLAINBridge.c b/Projects/XPLAINBridge/XPLAINBridge.c index 25307d3c0..a2afbbc3c 100644 --- a/Projects/XPLAINBridge/XPLAINBridge.c +++ b/Projects/XPLAINBridge/XPLAINBridge.c @@ -67,13 +67,13 @@ USB_ClassInfo_CDC_Device_t VirtualSerial_CDC_Interface = RingBuffer_t USBtoUART_Buffer; /** Underlying data buffer for \ref USBtoUART_Buffer, where the stored bytes are located. */ -uint8_t USBtoUART_Buffer_Data[128]; +static uint8_t USBtoUART_Buffer_Data[128]; /** Circular buffer to hold data from the serial port before it is sent to the host. */ RingBuffer_t UARTtoUSB_Buffer; /** Underlying data buffer for \ref UARTtoUSB_Buffer, where the stored bytes are located. */ -uint8_t UARTtoUSB_Buffer_Data[128]; +static uint8_t UARTtoUSB_Buffer_Data[128]; /** Main program entry point. This routine contains the overall program flow, including initial |