Skip to content

Commit

Permalink
June 16, 2020 Release (file set 2)
Browse files Browse the repository at this point in the history
  • Loading branch information
lorne smith committed Jun 16, 2020
1 parent 7d26c75 commit 920bd8a
Show file tree
Hide file tree
Showing 49 changed files with 1,986 additions and 1,977 deletions.
2 changes: 1 addition & 1 deletion Libraries/Boards/MAX78000/Include/pb.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ int PB_Init(void);
* @param pb Pointer to the push button index that triggered the
* callback.
*/
typedef void (*pb_callback)(void *pb);
typedef void (*pb_callback)(void* pb);

/**
* @brief Register or Unregister a callback handler for events on the @p pb push button.
Expand Down
6 changes: 3 additions & 3 deletions Libraries/Boards/MAX78000/Include/s26k.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,23 @@ int S26K_Write16(uint32_t addr, uint16_t data);
* @param len Number of bytes to write.
* @returns #E_NO_ERROR if erase succeeded. #E_UNKNOWN otherwise.
*/
int S26K_Write(uint32_t addr, uint16_t *data, unsigned len);
int S26K_Write(uint32_t addr, uint16_t* data, unsigned len);

/**
* @brief Read the s26k ID.
* @param addr Offset to start reading from.
* @param data Pointer to store the ID.
* @param len Number of ID bytes to read.
*/
void S26K_GetID(uint32_t offset, uint16_t *data, unsigned len);
void S26K_GetID(uint32_t offset, uint16_t* data, unsigned len);

/**
* @brief Read the s26k CFI.
* @param addr Offset to start reading from.
* @param data Pointer to store the CFI.
* @param len Number of CFI bytes to read.
*/
void S26K_GetCFI(uint32_t offset, uint16_t *data, unsigned len);
void S26K_GetCFI(uint32_t offset, uint16_t* data, unsigned len);


uint16_t S26K_GetSectorProtection(uint32_t addr);
Expand Down
4 changes: 0 additions & 4 deletions Libraries/PeriphDrivers/Source/ADC/adc_reva.c
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ int MXC_ADC_RevA_Init(void)
MXC_ADC->ctrl |= MXC_F_ADC_CTRL_PWR;
//turn on reference buffer power
MXC_ADC->ctrl |= MXC_F_ADC_CTRL_REFBUF_PWR;
//turn on charge pump enable
MXC_ADC->ctrl |= MXC_F_ADC_CTRL_CHGPUMP_PWR;

//wait until hardware set adc_intr.ref_ready_if to 1
while (!(MXC_ADC->intr & MXC_F_ADC_INTR_REF_READY_IF));
Expand All @@ -104,8 +102,6 @@ int MXC_ADC_RevA_Shutdown(void)
MXC_ADC->ctrl &= ~MXC_F_ADC_CTRL_PWR;
// Disable Reference Buffer Power
MXC_ADC->ctrl &= ~MXC_F_ADC_CTRL_REFBUF_PWR;
// Disable ADC Charge Pump
MXC_ADC->ctrl &= ~MXC_F_ADC_CTRL_CHGPUMP_PWR;
// Disable ADC Clock
MXC_ADC->ctrl &= ~MXC_F_ADC_CTRL_CLK_EN;

Expand Down
8 changes: 7 additions & 1 deletion Libraries/PeriphDrivers/Source/AES/aes_revb.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,12 +131,18 @@ void MXC_AES_RevB_Start()
MXC_AES->ctrl |= MXC_F_AES_CTRL_START;
}

void MXC_AES_RevB_IntEnable(uint32_t interrupt)
void MXC_AES_RevB_EnableInt(uint32_t interrupt)
{
MXC_AES->inten |= (interrupt & (MXC_F_AES_INTEN_DONE | MXC_F_AES_INTEN_KEY_CHANGE | \
MXC_F_AES_INTEN_KEY_ZERO | MXC_F_AES_INTEN_OV));
}

void MXC_AES_RevB_DisableInt(uint32_t interrupt)
{
MXC_AES->inten &= ~(interrupt & (MXC_F_AES_INTEN_DONE | MXC_F_AES_INTEN_KEY_CHANGE | \
MXC_F_AES_INTEN_KEY_ZERO | MXC_F_AES_INTEN_OV));
}

uint32_t MXC_AES_RevB_GetFlags()
{
return MXC_AES->intfl;
Expand Down
3 changes: 2 additions & 1 deletion Libraries/PeriphDrivers/Source/AES/aes_revb.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@
#include "aes.h"

int MXC_AES_RevB_Init ();
void MXC_AES_RevB_IntEnable (uint32_t interrupt);
void MXC_AES_RevB_EnableInt (uint32_t interrupt);
void MXC_AES_RevB_DisableInt (uint32_t interrupt);
int MXC_AES_RevB_IsBusy ();
int MXC_AES_RevB_Shutdown ();
void MXC_AES_RevB_GenerateKey();
Expand Down
50 changes: 25 additions & 25 deletions Libraries/PeriphDrivers/Source/CAMERAIF/cameraif_reva.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,63 +51,63 @@

/* **** Functions **** */

int MXC_PCIF_RevA_Init (void)
int MXC_PCIF_RevA_Init(void)
{
MXC_SYS_ClockEnable (MXC_SYS_PERIPH_CLOCK_PCIF);
MXC_GPIO_Config (&gpio_cfg_pcif_P0);
MXC_GPIO_Config (&gpio_cfg_pcif_P1);
MXC_GPIO_Config (&gpio_cfg_pcif_hsync);
MXC_GPIO_Config (&gpio_cfg_pcif_vsync);
MXC_GPIO_Config (&gpio_cfg_pcif_pclk);
MXC_GPIO_Config (&gpio_cfg_pcif_pwrdwn);
MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_PCIF);
MXC_GPIO_Config(&gpio_cfg_pcif_P0);
MXC_GPIO_Config(&gpio_cfg_pcif_P1);
MXC_GPIO_Config(&gpio_cfg_pcif_hsync);
MXC_GPIO_Config(&gpio_cfg_pcif_vsync);
MXC_GPIO_Config(&gpio_cfg_pcif_pclk);
MXC_GPIO_Config(&gpio_cfg_pcif_pwrdwn);

MXC_GPIO_OutClr (gpio_cfg_pcif_pwrdwn.port, gpio_cfg_pcif_pwrdwn.mask);
MXC_GPIO_OutClr(gpio_cfg_pcif_pwrdwn.port, gpio_cfg_pcif_pwrdwn.mask);

return 0;
}

void MXC_PCIF_RevA_SetDatawith (mxc_pcif_datawith_t datawith)
void MXC_PCIF_RevA_SetDatawith(mxc_pcif_datawith_t datawith)
{
MXC_CAMERAIF0->ctrl &= ~ (MXC_F_CAMERAIF_CTRL_DATA_WIDTH);
MXC_CAMERAIF0->ctrl &= ~(MXC_F_CAMERAIF_CTRL_DATA_WIDTH);
MXC_CAMERAIF0->ctrl |= (datawith << MXC_F_CAMERAIF_CTRL_DATA_WIDTH_POS);
}

void MXC_PCIF_RevA_SetTimingSel (mxc_pcif_timingsel_t timingsel)
void MXC_PCIF_RevA_SetTimingSel(mxc_pcif_timingsel_t timingsel)
{
MXC_CAMERAIF0->ctrl &= ~ (MXC_F_CAMERAIF_CTRL_DS_TIMING_EN);
MXC_CAMERAIF0->ctrl &= ~(MXC_F_CAMERAIF_CTRL_DS_TIMING_EN);
MXC_CAMERAIF0->ctrl |= (timingsel << MXC_F_CAMERAIF_CTRL_DS_TIMING_EN_POS);
}

void MXC_PCIF_RevA_SetTreshhold (int fifo_thrsh)
void MXC_PCIF_RevA_SetTreshhold(int fifo_thrsh)
{
MXC_CAMERAIF0->ctrl &= ~ (MXC_F_CAMERAIF_CTRL_FIFO_THRSH);
MXC_CAMERAIF0->ctrl |= ( (fifo_thrsh << MXC_F_CAMERAIF_CTRL_FIFO_THRSH_POS) & MXC_F_CAMERAIF_CTRL_FIFO_THRSH);
MXC_CAMERAIF0->ctrl &= ~(MXC_F_CAMERAIF_CTRL_FIFO_THRSH);
MXC_CAMERAIF0->ctrl |= ((fifo_thrsh << MXC_F_CAMERAIF_CTRL_FIFO_THRSH_POS) & MXC_F_CAMERAIF_CTRL_FIFO_THRSH);
}

void MXC_PCIF_RevA_EnableInt (uint32_t flags)
void MXC_PCIF_RevA_EnableInt(uint32_t flags)
{
MXC_CAMERAIF0->int_en |= (flags & PCIF_IE_MASK);
}

void MXC_PCIF_RevA_DisableInt (uint32_t flags)
void MXC_PCIF_RevA_DisableInt(uint32_t flags)
{
MXC_CAMERAIF0->int_en &= ~ (flags & PCIF_IE_MASK);
MXC_CAMERAIF0->int_en &= ~(flags & PCIF_IE_MASK);
}

void MXC_PCIF_RevA_Start (mxc_pcif_readmode_t readmode)
void MXC_PCIF_RevA_Start(mxc_pcif_readmode_t readmode)
{
MXC_CAMERAIF0->ctrl &= ~ (MXC_F_CAMERAIF_CTRL_READ_MODE);
MXC_CAMERAIF0->ctrl &= ~(MXC_F_CAMERAIF_CTRL_READ_MODE);
MXC_CAMERAIF0->ctrl |= (readmode & MXC_F_CAMERAIF_CTRL_READ_MODE);
}

void MXC_PCIF_RevA_Stop (void)
void MXC_PCIF_RevA_Stop(void)
{
MXC_CAMERAIF0->ctrl &= ~ (MXC_F_CAMERAIF_CTRL_READ_MODE);
MXC_CAMERAIF0->ctrl &= ~(MXC_F_CAMERAIF_CTRL_READ_MODE);
}

unsigned int MXC_PCIF_RevA_GetData (void)
unsigned int MXC_PCIF_RevA_GetData(void)
{
return (unsigned int) (MXC_CAMERAIF0->fifo_data);
return (unsigned int)(MXC_CAMERAIF0->fifo_data);
}


Expand Down
30 changes: 15 additions & 15 deletions Libraries/PeriphDrivers/Source/CRC/crc_me17.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,70 +44,70 @@
/* Global Control/Configuration functions */
/* ************************************************************************* */

int MXC_CRC_Init (void)
int MXC_CRC_Init(void)
{
MXC_SYS_ClockEnable(MXC_SYS_PERIPH_CLOCK_CRC);

MXC_CRC_RevA_Init();

return E_NO_ERROR;
}

int MXC_CRC_Shutdown (void)
int MXC_CRC_Shutdown(void)
{
int error = MXC_CRC_RevA_Shutdown();

MXC_SYS_ClockDisable(MXC_SYS_PERIPH_CLOCK_CRC);

return error;
}

int MXC_CRC_Handler (int ch, int error)
int MXC_CRC_Handler(int ch, int error)
{
return MXC_CRC_RevA_Handler(ch, error);
}

void MXC_CRC_SetDirection (mxc_crc_bitorder_t bitOrder)
void MXC_CRC_SetDirection(mxc_crc_bitorder_t bitOrder)
{
MXC_CRC_RevA_SetDirection(bitOrder);
}

mxc_crc_bitorder_t MXC_CRC_GetDirection (void)
mxc_crc_bitorder_t MXC_CRC_GetDirection(void)
{
return MXC_CRC_RevA_GetDirection();
}

void MXC_CRC_SwapDataIn (mxc_crc_bitorder_t bitOrder)
void MXC_CRC_SwapDataIn(mxc_crc_bitorder_t bitOrder)
{
MXC_CRC_RevA_SwapDataIn(bitOrder);
}

void MXC_CRC_SwapDataOut (mxc_crc_bitorder_t bitOrder)
void MXC_CRC_SwapDataOut(mxc_crc_bitorder_t bitOrder)
{
MXC_CRC_RevA_SwapDataOut(bitOrder);
}

void MXC_CRC_SetPoly (uint32_t poly)
void MXC_CRC_SetPoly(uint32_t poly)
{
MXC_CRC_RevA_SetPoly(poly);
}

uint32_t MXC_CRC_GetPoly (void)
uint32_t MXC_CRC_GetPoly(void)
{
return MXC_CRC_RevA_GetPoly();
}

uint32_t MXC_CRC_GetResult (void)
uint32_t MXC_CRC_GetResult(void)
{
return MXC_CRC_RevA_GetResult();
}

int MXC_CRC_Compute (mxc_crc_req_t* req)
int MXC_CRC_Compute(mxc_crc_req_t* req)
{
return MXC_CRC_RevA_Compute(req);
}

int MXC_CRC_ComputeAsync (mxc_crc_req_t* req)
int MXC_CRC_ComputeAsync(mxc_crc_req_t* req)
{
return MXC_CRC_RevA_ComputeAsync(req);
}
8 changes: 4 additions & 4 deletions Libraries/PeriphDrivers/Source/CTB/ctb_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

/* ************************************************************************* */

unsigned int MXC_CTB_Common_Hash_GetBlockSize (mxc_ctb_hash_func_t function)
unsigned int MXC_CTB_Common_Hash_GetBlockSize(mxc_ctb_hash_func_t function)
{
// Block size in bytes indexed by hash function
switch (function) {
Expand All @@ -63,7 +63,7 @@ unsigned int MXC_CTB_Common_Hash_GetBlockSize (mxc_ctb_hash_func_t function)
return 0;
}

unsigned int MXC_CTB_Common_Hash_GetDigestSize (mxc_ctb_hash_func_t function)
unsigned int MXC_CTB_Common_Hash_GetDigestSize(mxc_ctb_hash_func_t function)
{
// Digest length in bytes indexed by hash function
switch (function) {
Expand All @@ -90,7 +90,7 @@ unsigned int MXC_CTB_Common_Hash_GetDigestSize (mxc_ctb_hash_func_t function)
return 0;
}

unsigned int MXC_CTB_Common_Cipher_GetKeySize (mxc_ctb_cipher_t cipher)
unsigned int MXC_CTB_Common_Cipher_GetKeySize(mxc_ctb_cipher_t cipher)
{
switch (cipher) {
case MXC_CTB_CIPHER_DIS:
Expand All @@ -116,7 +116,7 @@ unsigned int MXC_CTB_Common_Cipher_GetKeySize (mxc_ctb_cipher_t cipher)
return 0;
}

unsigned int MXC_CTB_Common_Cipher_GetBlockSize (mxc_ctb_cipher_t cipher)
unsigned int MXC_CTB_Common_Cipher_GetBlockSize(mxc_ctb_cipher_t cipher)
{
switch (cipher) {
case MXC_CTB_CIPHER_DIS:
Expand Down
Loading

0 comments on commit 920bd8a

Please sign in to comment.