From 3cfa5c59e6a69106fefdbd35f39ab1179a49959f Mon Sep 17 00:00:00 2001 From: Evan Lojewski Date: Sat, 9 Feb 2019 18:09:33 -0700 Subject: Do a manual clang-format run --- libs/MII/include/MII.h | 2 +- libs/MII/mii.c | 4 +-- libs/NVRam/crc.c | 10 +++--- libs/NVRam/include/NVRam.h | 17 +++++---- libs/NVRam/nvm.c | 62 ++++++++++++++++----------------- libs/VPD/include/vpd.h | 46 +++++++++++++------------ libs/VPD/vpd.c | 86 ++++++++++++++++++++++++++-------------------- 7 files changed, 120 insertions(+), 107 deletions(-) (limited to 'libs') diff --git a/libs/MII/include/MII.h b/libs/MII/include/MII.h index c41f96e..160bc54 100644 --- a/libs/MII/include/MII.h +++ b/libs/MII/include/MII.h @@ -2,7 +2,7 @@ /// /// @file MII.h /// -/// @project +/// @project /// /// @brief MII Support Routines /// diff --git a/libs/MII/mii.c b/libs/MII/mii.c index c4d7084..eb8ae24 100644 --- a/libs/MII/mii.c +++ b/libs/MII/mii.c @@ -2,7 +2,7 @@ /// /// @file MII.c /// -/// @project +/// @project /// /// @brief MII Support Routines /// @@ -47,7 +47,7 @@ static void MII_wait(void) { // Wait for the status bit to be clear. - while(DEVICE.MiiCommunication.bits.Start_DIV_Busy) + while (DEVICE.MiiCommunication.bits.Start_DIV_Busy) { // Waiting... } diff --git a/libs/NVRam/crc.c b/libs/NVRam/crc.c index ec4d66e..b2d8f73 100644 --- a/libs/NVRam/crc.c +++ b/libs/NVRam/crc.c @@ -2,7 +2,7 @@ /// /// @file crc.c /// -/// @project +/// @project /// /// @brief CRC Support Routines /// @@ -46,10 +46,9 @@ #define CRC32_POLYNOMIAL 0xEDB88320 -uint32_t NVRam_crc ( - uint8_t *pcDatabuf, // Pointer to data buffer - uint32_t ulDatalen, // Length of data buffer in bytes - uint32_t crc) // Initial value +uint32_t NVRam_crc(uint8_t *pcDatabuf, // Pointer to data buffer + uint32_t ulDatalen, // Length of data buffer in bytes + uint32_t crc) // Initial value { uint8_t data; uint32_t idx, bit; @@ -61,5 +60,6 @@ uint32_t NVRam_crc ( crc = (crc >> 1) ^ (((crc ^ data) & 1) ? CRC32_POLYNOMIAL : 0); } } + return crc; } diff --git a/libs/NVRam/include/NVRam.h b/libs/NVRam/include/NVRam.h index 5f2fcfb..3d995ff 100644 --- a/libs/NVRam/include/NVRam.h +++ b/libs/NVRam/include/NVRam.h @@ -2,7 +2,7 @@ /// /// @file NVRam.h /// -/// @project +/// @project /// /// @brief NVRam Support Routines /// @@ -44,25 +44,24 @@ #ifndef NVRAM_H #define NVRAM_H -#include -#include #include +#include +#include bool NVRam_acquireLock(void); bool NVRam_releaseLock(void); uint32_t NVRam_readWord(uint32_t address); -void NVRam_read(uint32_t address, uint32_t* buffer, size_t words); +void NVRam_read(uint32_t address, uint32_t *buffer, size_t words); void NVRam_writeWord(uint32_t address, uint32_t data); -void NVRam_write(uint32_t address, uint32_t* buffer, size_t words); +void NVRam_write(uint32_t address, uint32_t *buffer, size_t words); void NVRam_enable(void); void NVRam_disable(void); -uint32_t NVRam_crc( - uint8_t *pcDatabuf, // Pointer to data buffer - uint32_t ulDatalen, // Length of data buffer in bytes - uint32_t crc); // Initial value +uint32_t NVRam_crc(uint8_t *pcDatabuf, // Pointer to data buffer + uint32_t ulDatalen, // Length of data buffer in bytes + uint32_t crc); // Initial value #endif /* NVRAM_H */ diff --git a/libs/NVRam/nvm.c b/libs/NVRam/nvm.c index 2e3e965..bfd35f7 100644 --- a/libs/NVRam/nvm.c +++ b/libs/NVRam/nvm.c @@ -2,7 +2,7 @@ /// /// @file NVRam.c /// -/// @project +/// @project /// /// @brief NVRam Support Routines /// @@ -41,31 +41,31 @@ /// POSSIBILITY OF SUCH DAMAGE. /// @endcond //////////////////////////////////////////////////////////////////////////////// -#include #include "bcm5719_NVM.h" -#define ATMEL_AT45DB0X1B_PAGE_POS (9u) -#define ATMEL_AT45DB0X1B_PAGE_SIZE (264u) -#define ATMEL_AT45DB0X1B_ERASE (false) +#include + +#define ATMEL_AT45DB0X1B_PAGE_POS (9u) +#define ATMEL_AT45DB0X1B_PAGE_SIZE (264u) +#define ATMEL_AT45DB0X1B_ERASE (false) -#define PAGE_POS ATMEL_AT45DB0X1B_PAGE_POS -#define PAGE_SIZE ATMEL_AT45DB0X1B_PAGE_SIZE -#define NEEDS_ERASE ATMEL_AT45DB0X1B_ERASE +#define PAGE_POS ATMEL_AT45DB0X1B_PAGE_POS +#define PAGE_SIZE ATMEL_AT45DB0X1B_PAGE_SIZE +#define NEEDS_ERASE ATMEL_AT45DB0X1B_ERASE #ifdef CXX_SIMULATOR #include -#define REQ ReqSet2 -#define CLR ReqClr2 -#define WON ArbWon2 +#define REQ ReqSet2 +#define CLR ReqClr2 +#define WON ArbWon2 #else /* Firmware */ -#define ntohl(__x__) (__x__) -#define htonl(__x__) (__x__) -#define REQ ReqSet0 -#define CLR ReqClr0 -#define WON ArbWon0 +#define ntohl(__x__) (__x__) +#define htonl(__x__) (__x__) +#define REQ ReqSet0 +#define CLR ReqClr0 +#define WON ArbWon0 #endif - /** * @fn uint32_t NVRam_translate(uint32_t address) * @@ -85,7 +85,7 @@ static inline uint32_t NVRam_translate(uint32_t address) } #else return address; -#endif +#endif } void NVRam_enable(void) @@ -102,9 +102,8 @@ void NVRam_disable(void) static inline void NVRam_waitDone(void) { - while(!NVM.Command.bits.Done) + while (!NVM.Command.bits.Done) { - } } @@ -113,7 +112,7 @@ bool NVRam_acquireLock(void) // Grab lock NVM.SoftwareArbitration.bits.REQ = 1; - while(!NVM.SoftwareArbitration.bits.WON) + while (!NVM.SoftwareArbitration.bits.WON) { // Spin } @@ -144,7 +143,8 @@ static uint32_t NVRam_readWordInternal(uint32_t address, RegNVMCommand_t cmd) return ntohl(NVM.Read.r32); } -static void NVRam_writeWordInternal(uint32_t address, uint32_t data, RegNVMCommand_t cmd) +static void NVRam_writeWordInternal(uint32_t address, uint32_t data, + RegNVMCommand_t cmd) { address = NVRam_translate(address); @@ -170,9 +170,9 @@ uint32_t NVRam_readWord(uint32_t address) return NVRam_readWordInternal(address, cmd); } -void NVRam_read(uint32_t address, uint32_t* buffer, size_t words) +void NVRam_read(uint32_t address, uint32_t *buffer, size_t words) { - if(!words) + if (!words) { // No data to read. return; @@ -183,9 +183,9 @@ void NVRam_read(uint32_t address, uint32_t* buffer, size_t words) cmd.bits.Doit = 1; cmd.bits.First = 1; - while(words) + while (words) { - if(1 == words) + if (1 == words) { // Last word. cmd.bits.Last = 1; @@ -194,7 +194,7 @@ void NVRam_read(uint32_t address, uint32_t* buffer, size_t words) *buffer = NVRam_readWordInternal(address, cmd); buffer++; words--; - address +=4; + address += 4; // If we have more than one word, clear the first bit. cmd.bits.First = 0; @@ -212,9 +212,9 @@ void NVRam_writeWord(uint32_t address, uint32_t data) NVRam_writeWordInternal(address, data, cmd); } -void NVRam_write(uint32_t address, uint32_t* buffer, size_t words) +void NVRam_write(uint32_t address, uint32_t *buffer, size_t words) { - if(!words) + if (!words) { // No bytes to read. return; @@ -226,9 +226,9 @@ void NVRam_write(uint32_t address, uint32_t* buffer, size_t words) cmd.bits.First = 1; cmd.bits.Wr = 1; - while(words) + while (words) { - if(1 == words) + if (1 == words) { // Last word. cmd.bits.Last = 1; diff --git a/libs/VPD/include/vpd.h b/libs/VPD/include/vpd.h index 3b266f7..c7c85ea 100644 --- a/libs/VPD/include/vpd.h +++ b/libs/VPD/include/vpd.h @@ -2,7 +2,7 @@ /// /// @file vpd.c /// -/// @project +/// @project /// /// @brief VPD Support Routines /// @@ -42,9 +42,9 @@ /// @endcond //////////////////////////////////////////////////////////////////////////////// -#include #include #include +#include #define VPD_DATA_TYPE_SMALL (0x00) #define VPD_DATA_TYPE_LARGE (0x01) @@ -53,29 +53,31 @@ #define VPD_TAG_VPD_R (0x10) #define VPD_TAG_VPD_W (0x11) typedef union { - struct { - uint8_t bytes:3; - uint8_t tag:4; - uint8_t type:1; + struct + { + uint8_t bytes : 3; + uint8_t tag : 4; + uint8_t type : 1; } small; - struct { - uint8_t tag:7; - uint8_t type:1; + struct + { + uint8_t tag : 7; + uint8_t type : 1; } large; uint8_t data; } vpd_resource_typet_t; -typedef struct { - uint16_t name; - uint8_t length; - uint8_t data; +typedef struct +{ + uint16_t name; + uint8_t length; + uint8_t data; } __attribute__((packed)) vpd_field_t; typedef union { uint8_t bytes[0x100]; } vpd_t; - #define VPD_PRODUCT_NAME "PN" #define VPD_ENGINEERING_CHANGE "EC" #define VPD_SERIAL_NUMBER "SN" @@ -83,12 +85,12 @@ typedef union { #define VPD_VENDOR_SPECIFIC_0 "V0" #define VPD_CHECKSUM "RV" -const char* vpd_get_field_name(uint16_t field); - - -uint8_t* vpd_get_identifier(uint8_t *buffer, size_t *len); -uint8_t* vpd_get_resource_by_name(uint8_t* buffer, size_t* len, uint16_t name); -uint8_t* vpd_get_resource_by_index(uint8_t* buffer, size_t* len, uint16_t* name, size_t index); -bool vpd_set_resource(uint8_t* buffer, size_t len, uint16_t resource, uint8_t* add_data, size_t add_len); -bool vpd_is_valid(uint8_t* buffer, size_t len); +const char *vpd_get_field_name(uint16_t field); +uint8_t *vpd_get_identifier(uint8_t *buffer, size_t *len); +uint8_t *vpd_get_resource_by_name(uint8_t *buffer, size_t *len, uint16_t name); +uint8_t *vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name, + size_t index); +bool vpd_set_resource(uint8_t *buffer, size_t len, uint16_t resource, + uint8_t *add_data, size_t add_len); +bool vpd_is_valid(uint8_t *buffer, size_t len); diff --git a/libs/VPD/vpd.c b/libs/VPD/vpd.c index 04a4ad6..3308061 100644 --- a/libs/VPD/vpd.c +++ b/libs/VPD/vpd.c @@ -2,7 +2,7 @@ /// /// @file vpd.c /// -/// @project +/// @project /// /// @brief VPD Support Routines /// @@ -42,22 +42,19 @@ /// @endcond //////////////////////////////////////////////////////////////////////////////// -#include -#include -#include #include - #include +#include +#include +#include - -typedef struct { - const char* name; - const char* string; +typedef struct +{ + const char *name; + const char *string; } vpd_name_entry_t; - -vpd_name_entry_t mNames[] = -{ +vpd_name_entry_t mNames[] = { {.name = VPD_PRODUCT_NAME, .string = "Product Name"}, {.name = VPD_ENGINEERING_CHANGE, .string = "Engineering Change"}, {.name = VPD_SERIAL_NUMBER, .string = "Serial Number"}, @@ -67,17 +64,17 @@ vpd_name_entry_t mNames[] = bool vpd_is_checksum(uint16_t field) { - if(0 == strncmp(VPD_CHECKSUM, (const char*)&field, 2)) + if (0 == strncmp(VPD_CHECKSUM, (const char *)&field, 2)) { return true; } return false; } -const char* vpd_get_field_name(uint16_t field) +const char *vpd_get_field_name(uint16_t field) { - for(int i = 0; i < sizeof(mNames)/sizeof(mNames[0]); i++) + for (int i = 0; i < sizeof(mNames) / sizeof(mNames[0]); i++) { - if(0 == strncmp(mNames[i].name, (const char*)&field, 2)) + if (0 == strncmp(mNames[i].name, (const char *)&field, 2)) { return mNames[i].string; } @@ -87,13 +84,16 @@ const char* vpd_get_field_name(uint16_t field) return NULL; } -static uint8_t* get_next_tag(uint8_t* buffer, size_t *len) +static uint8_t *get_next_tag(uint8_t *buffer, size_t *len) { - if(!len) return NULL; + if (!len) + { + return NULL; + } uint16_t tag_len = 0; vpd_resource_typet_t b0 = {.data = buffer[0]}; - if(VPD_DATA_TYPE_LARGE == b0.large.type) + if (VPD_DATA_TYPE_LARGE == b0.large.type) { tag_len = 3; @@ -109,12 +109,15 @@ static uint8_t* get_next_tag(uint8_t* buffer, size_t *len) return &buffer[tag_len]; } -static uint8_t* get_tag_data(uint8_t* buffer, size_t *len) +static uint8_t *get_tag_data(uint8_t *buffer, size_t *len) { - if(!len) return NULL; + if (!len) + { + return NULL; + } vpd_resource_typet_t b0 = {.data = buffer[0]}; - if(VPD_DATA_TYPE_LARGE == b0.large.type) + if (VPD_DATA_TYPE_LARGE == b0.large.type) { *len = buffer[1] | buffer[2] << 8; return &buffer[3]; @@ -126,59 +129,68 @@ static uint8_t* get_tag_data(uint8_t* buffer, size_t *len) } } -uint8_t* vpd_get_resource_by_name(uint8_t *buffer, size_t *len, uint16_t type) +uint8_t *vpd_get_resource_by_name(uint8_t *buffer, size_t *len, uint16_t type) { return NULL; } -uint8_t* vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name, size_t index) + +uint8_t *vpd_get_resource_by_index(uint8_t *buffer, size_t *len, uint16_t *name, + size_t index) { index++; size_t new_len = *len; uint8_t *new_buf = get_next_tag(buffer, &new_len); new_buf = get_tag_data(new_buf, &new_len); - vpd_field_t* field; + vpd_field_t *field; do { - field = (vpd_field_t*)new_buf; + field = (vpd_field_t *)new_buf; - char* data = (char*)malloc(field->length + 1); + char *data = (char *)malloc(field->length + 1); memcpy(data, &field->data, field->length); data[field->length] = 0; new_buf += field->length; new_buf += 3; - index--; - if(index && vpd_is_checksum(field->name)) + index--; + if (index && vpd_is_checksum(field->name)) { // last entry found, but we requested more. return NULL; } - } while(index); + } while (index); *name = field->name; *len = field->length; return &field->data; } -bool vpd_set_resource(uint8_t *buffer, size_t len, uint16_t resource, uint8_t *add_data, size_t add_len) +bool vpd_set_resource(uint8_t *buffer, size_t len, uint16_t resource, + uint8_t *add_data, size_t add_len) { return false; } -bool vpd_is_valid(uint8_t* buffer, size_t len) +bool vpd_is_valid(uint8_t *buffer, size_t len) { - if(!len) return false; + if (!len) + { + return false; + } - if(!vpd_get_identifier(buffer, &len)) return false; + if (!vpd_get_identifier(buffer, &len)) + { + return false; + } // TODO: check checksum. return true; } -uint8_t* vpd_get_identifier(uint8_t* buffer, size_t* len) +uint8_t *vpd_get_identifier(uint8_t *buffer, size_t *len) { - if(!len) return NULL; - + if (!len) + return NULL; return get_tag_data(buffer, len); } -- cgit v1.2.1