Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-29 20:56:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix nuttx coding style

Browse Source 
Remove TABs
Fix indentation
Fix Multi-line comments
Fix Comments to the Right of Statements.

Fix nuttx coding style

Fix Comments to the Right of Statements.
This commit is contained in:
simbit18
2023-07-13 09:52:33 +02:00
committed by Xiang Xiao
parent 0ee304954a
commit 1b1ac6f3b7
22 changed files with 596 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/include/cxd56xx/pm.h
+22 -22
View File
@@ -34,26 +34,26 @@
/* Boot Cause definitions */ /* Boot Cause definitions */
#define PM_BOOT_POR_NORMAL (0x00000000ul) /** Power On Reset like as battery attached */ #define PM_BOOT_POR_NORMAL (0x00000000ul) /* Power On Reset like as battery attached */
#define PM_BOOT_POR_DEADBATT (0x00000001ul) /** Battery charged from DeadBattery state */ #define PM_BOOT_POR_DEADBATT (0x00000001ul) /* Battery charged from DeadBattery state */
#define PM_BOOT_WDT_REBOOT (0x00000002ul) /** System WDT expired or Explicitly Self Reboot */ #define PM_BOOT_WDT_REBOOT (0x00000002ul) /* System WDT expired or Explicitly Self Reboot */
#define PM_BOOT_WDT_RESET (0x00000004ul) /** Chip WDT expired (might be used in HV-only system) */ #define PM_BOOT_WDT_RESET (0x00000004ul) /* Chip WDT expired (might be used in HV-only system) */
#define PM_BOOT_DEEP_WKUPL (0x00000008ul) /** In DeepSleep state, Detected WKUPL signal */ #define PM_BOOT_DEEP_WKUPL (0x00000008ul) /* In DeepSleep state, Detected WKUPL signal */
#define PM_BOOT_DEEP_WKUPS (0x00000010ul) /** In DeepSleep state, Detected WKUPS signal */ #define PM_BOOT_DEEP_WKUPS (0x00000010ul) /* In DeepSleep state, Detected WKUPS signal */
#define PM_BOOT_DEEP_RTC (0x00000020ul) /** In DeepSleep state, RTC Alarm expired */ #define PM_BOOT_DEEP_RTC (0x00000020ul) /* In DeepSleep state, RTC Alarm expired */
#define PM_BOOT_DEEP_USB_ATTACH (0x00000040ul) /** In DeepSleep state, USB Connected */ #define PM_BOOT_DEEP_USB_ATTACH (0x00000040ul) /* In DeepSleep state, USB Connected */
#define PM_BOOT_DEEP_OTHERS (0x00000080ul) /** In DeepSleep state, Reserved others cause occurred */ #define PM_BOOT_DEEP_OTHERS (0x00000080ul) /* In DeepSleep state, Reserved others cause occurred */
#define PM_BOOT_COLD_SCU_INT (0x00000100ul) /** In ColdSleep state, Detected SCU Interrupt */ #define PM_BOOT_COLD_SCU_INT (0x00000100ul) /* In ColdSleep state, Detected SCU Interrupt */
#define PM_BOOT_COLD_RTC (0x00001e00ul) /** In ColdSleep state, RTC Alarm Interrupt */ #define PM_BOOT_COLD_RTC (0x00001e00ul) /* In ColdSleep state, RTC Alarm Interrupt */
#define PM_BOOT_COLD_RTC_ALM0 (0x00000200ul) /** In ColdSleep state, RTC Alarm0 expired */ #define PM_BOOT_COLD_RTC_ALM0 (0x00000200ul) /* In ColdSleep state, RTC Alarm0 expired */
#define PM_BOOT_COLD_RTC_ALM1 (0x00000400ul) /** In ColdSleep state, RTC Alarm1 expired */ #define PM_BOOT_COLD_RTC_ALM1 (0x00000400ul) /* In ColdSleep state, RTC Alarm1 expired */
#define PM_BOOT_COLD_RTC_ALM2 (0x00000800ul) /** In ColdSleep state, RTC Alarm2 expired */ #define PM_BOOT_COLD_RTC_ALM2 (0x00000800ul) /* In ColdSleep state, RTC Alarm2 expired */
#define PM_BOOT_COLD_RTC_ALMERR (0x00001000ul) /** In ColdSleep state, RTC Alarm Error occurred */ #define PM_BOOT_COLD_RTC_ALMERR (0x00001000ul) /* In ColdSleep state, RTC Alarm Error occurred */
#define PM_BOOT_COLD_GPIO (0x0fff0000ul) /** In ColdSleep state, Detected GPIO interrupt */ #define PM_BOOT_COLD_GPIO (0x0fff0000ul) /* In ColdSleep state, Detected GPIO interrupt */
#define PM_BOOT_COLD_SEN_INT (0x10000000ul) /** In ColdSleep state, Detected SEN_INT Interrupt */ #define PM_BOOT_COLD_SEN_INT (0x10000000ul) /* In ColdSleep state, Detected SEN_INT Interrupt */
#define PM_BOOT_COLD_PMIC_INT (0x20000000ul) /** In ColdSleep state, Detected PMIC Interrupt */ #define PM_BOOT_COLD_PMIC_INT (0x20000000ul) /* In ColdSleep state, Detected PMIC Interrupt */
#define PM_BOOT_COLD_USB_DETACH (0x40000000ul) /** In ColdSleep state, USB Disconnected */ #define PM_BOOT_COLD_USB_DETACH (0x40000000ul) /* In ColdSleep state, USB Disconnected */
#define PM_BOOT_COLD_USB_ATTACH (0x80000000ul) /** In ColdSleep state, USB Connected */ #define PM_BOOT_COLD_USB_ATTACH (0x80000000ul) /* In ColdSleep state, USB Connected */
/* SRAM power status definitions */ /* SRAM power status definitions */
@@ -350,14 +350,14 @@ int up_pm_reboot(void);
* Name: up_pmic_set_notify * Name: up_pmic_set_notify
* *
* Description: * Description:
* Register a callback for pmic interrupt * Register a callback for pmic interrupt.
* *
* Input Parameter: * Input Parameter:
* kind - A kind of pmic interrupt defined as pmic_notify_e * kind - A kind of pmic interrupt defined as pmic_notify_e
* cb - A callback function for a kind of pmic interrupt * cb - A callback function for a kind of pmic interrupt
* *
* Returned Value: * Returned Value:
* Return 0 on success. Otherwise, return a negated errno. * Return 0 on success. Otherwise, return a negated errno.
* *
****************************************************************************/ ****************************************************************************/
arch/arm/src/rtl8720c/amebaz_coex.h
+4 -4
View File
@@ -45,18 +45,18 @@
typedef struct net_buf_simple_s typedef struct net_buf_simple_s
{ {
/* * Pointer to the start of data in the buffer. */ /* Pointer to the start of data in the buffer. */
uint8_t *data; uint8_t *data;
/* * Length of the data behind the data pointer. */ /* Length of the data behind the data pointer. */
uint16_t len; uint16_t len;
/* * Amount of data that this buffer can store. */ /* Amount of data that this buffer can store. */
uint16_t size; uint16_t size;
/** Start of the data storage. Not to be accessed directly /* Start of the data storage. Not to be accessed directly
* (the data pointer should be used instead). * (the data pointer should be used instead).
*/ */
arch/arm/src/s32k3xx/hardware/s32k3xx_dmamux.h
+2 -2
View File
@@ -105,7 +105,7 @@
/* DMA Request sources */ /* DMA Request sources */
/** edma_mux0 **/ /* edma_mux0 */
#define DMA_REQ_DISABLED0 (0) /* Channel disabled (default) */ #define DMA_REQ_DISABLED0 (0) /* Channel disabled (default) */
#define DMA_REQ_SIUL_0 (1) /* SIUL DMA request 0 */ #define DMA_REQ_SIUL_0 (1) /* SIUL DMA request 0 */
@@ -172,7 +172,7 @@
#define DMA_REQ_ENABLED0 (62) /* Always enabled */ #define DMA_REQ_ENABLED0 (62) /* Always enabled */
#define DMA_REQ_ENABLED1 (63) /* Always enabled */ #define DMA_REQ_ENABLED1 (63) /* Always enabled */
/** edma_mux1 **/ /* edma_mux1 */
#define DMA_REQ_DISABLED1 (DMAMUX_CHCFG_DMAMUX1 | 0) /* Channel disabled (default) */ #define DMA_REQ_DISABLED1 (DMAMUX_CHCFG_DMAMUX1 | 0) /* Channel disabled (default) */
#define DMA_REQ_SIUL_8 (DMAMUX_CHCFG_DMAMUX1 | 1) /* SIUL DMA request 8 */ #define DMA_REQ_SIUL_8 (DMAMUX_CHCFG_DMAMUX1 | 1) /* SIUL DMA request 8 */
arch/arm/src/samd5e5/sam_usb.c
+50 -59
View File
@@ -398,37 +398,35 @@ enum sam_hoststate_e
enum usb_h_pipe_state enum usb_h_pipe_state
{ {
USB_H_PIPE_S_FREE = 0x00, /** Pipe is free to allocate */ USB_H_PIPE_S_FREE = 0x00, /* Pipe is free to allocate */
USB_H_PIPE_S_CFG = 0x01, /** Pipe is in configuration */ USB_H_PIPE_S_CFG = 0x01, /* Pipe is in configuration */
USB_H_PIPE_S_IDLE = 0x02, /** Pipe is allocated and idle */ USB_H_PIPE_S_IDLE = 0x02, /* Pipe is allocated and idle */
USB_H_PIPE_S_SETUP = 0x03, /** Pipe in control setup stage */ USB_H_PIPE_S_SETUP = 0x03, /* Pipe in control setup stage */
USB_H_PIPE_S_DATI = 0x05, /** Pipe in data IN stage */ USB_H_PIPE_S_DATI = 0x05, /* Pipe in data IN stage */
USB_H_PIPE_S_DATO = 0x06, /** Pipe in data OUT stage */ USB_H_PIPE_S_DATO = 0x06, /* Pipe in data OUT stage */
USB_H_PIPE_S_ZLPI = 0x07, /** Pipe in data IN ZLP stage */ USB_H_PIPE_S_ZLPI = 0x07, /* Pipe in data IN ZLP stage */
USB_H_PIPE_S_ZLPO = 0x08, /** Pipe in data OUT ZLP stage */ USB_H_PIPE_S_ZLPO = 0x08, /* Pipe in data OUT ZLP stage */
USB_H_PIPE_S_STATI = 0x09, /** Pipe in control status IN stage */ USB_H_PIPE_S_STATI = 0x09, /* Pipe in control status IN stage */
USB_H_PIPE_S_STATO = 0x0a, /** Pipe in control status OUT stage */ USB_H_PIPE_S_STATO = 0x0a, /* Pipe in control status OUT stage */
USB_H_PIPE_S_TAKEN = 0x10 /** Taken by physical pipe (in process) */ USB_H_PIPE_S_TAKEN = 0x10 /* Taken by physical pipe (in process) */
}; };
/** /* USB HCD status code */
* @brief USB HCD status code
*/
enum usb_h_status enum usb_h_status
{ {
USB_H_OK = 0, /** OK */ USB_H_OK = 0, /* OK */
USB_H_BUSY = -4, /** Busy */ USB_H_BUSY = -4, /* Busy */
USB_H_DENIED = -17, /** Denied */ USB_H_DENIED = -17, /* Denied */
USB_H_TIMEOUT = -8, /** Timeout */ USB_H_TIMEOUT = -8, /* Timeout */
USB_H_ABORT = -3, /** Abort */ USB_H_ABORT = -3, /* Abort */
USB_H_STALL = -25, /** Stall protocol */ USB_H_STALL = -25, /* Stall protocol */
USB_H_RESET = -7, /** Transfer reset by pipe re-configure */ USB_H_RESET = -7, /* Transfer reset by pipe re-configure */
USB_H_ERR_ARG = -13, /** Argument error */ USB_H_ERR_ARG = -13, /* Argument error */
USB_H_ERR_UNSP_OP = -27, /** Operation not supported */ USB_H_ERR_UNSP_OP = -27, /* Operation not supported */
USB_H_ERR_NO_RSC = -28, /** No resource */ USB_H_ERR_NO_RSC = -28, /* No resource */
USB_H_ERR_NOT_INIT = -20, /** Not initialized */ USB_H_ERR_NOT_INIT = -20, /* Not initialized */
USB_H_ERR = -6 /** Some general error */ USB_H_ERR = -6 /* Some general error */
}; };
/* The following enumeration represents the various states of the USB host /* The following enumeration represents the various states of the USB host
@@ -459,8 +457,7 @@ enum sam_chreason_e
CHREASON_CANCELLED /* Transfer cancelled */ CHREASON_CANCELLED /* Transfer cancelled */
}; };
/** /* Transfer descriptor for control transfer
* @brief Transfer descriptor for control transfer
* *
* Timing in USB 2.0 spec.: * Timing in USB 2.0 spec.:
* - 9.2.6.1 : USB sets an upper limit of 5 seconds as the upper * - 9.2.6.1 : USB sets an upper limit of 5 seconds as the upper
@@ -484,7 +481,7 @@ enum sam_chreason_e
* to the host within 500 ms of receipt of the request. For * to the host within 500 ms of receipt of the request. For
* subsequent data packets, if any, the device must be able to * subsequent data packets, if any, the device must be able to
* return them within 500 ms of successful completion of the * return them within 500 ms of successful completion of the
* transmission of the previous packet. The device must then be * transmission of the previous packet. The device must then be
* able to successfully complete the status stage * able to successfully complete the status stage
* within 50 ms after returning the last data packet. * within 50 ms after returning the last data packet.
* For standard device requests that require a data stage transfer * For standard device requests that require a data stage transfer
@@ -512,49 +509,43 @@ struct usb_h_ctrl_xfer
int8_t status; /* Last transfer status */ int8_t status; /* Last transfer status */
}; };
/** /* Transfer descriptor for bulk / interrupt / iso transfer */
* Transfer descriptor for bulk / interrupt / iso transfer
*/
struct usb_h_bulk_int_iso_xfer struct usb_h_bulk_int_iso_xfer
{ {
uint32_t size; /** Expected transfer size */ uint32_t size; /* Expected transfer size */
uint32_t count; /** Transfer count */ uint32_t count; /* Transfer count */
uint8_t *data; /** Pointer to transfer data */ uint8_t *data; /* Pointer to transfer data */
uint16_t reserved[3]; uint16_t reserved[3];
uint8_t state; /** Transfer state */ uint8_t state; /* Transfer state */
int8_t status; /** Last transfer status */ int8_t status; /* Last transfer status */
}; };
/** /* Transfer descriptor for periodic high bandwidth transfer */
* Transfer descriptor for periodic high bandwidth transfer
*/
struct usb_h_high_bw_xfer struct usb_h_high_bw_xfer
{ {
uint32_t size; /** Expected transfer size */ uint32_t size; /* Expected transfer size */
uint32_t count; /** Transfer count */ uint32_t count; /* Transfer count */
uint8_t *data; /** Pointer to transfer data */ uint8_t *data; /* Pointer to transfer data */
uint16_t pkt_size[3]; /** Micro frame packet sizes */ uint16_t pkt_size[3]; /* Micro frame packet sizes */
uint8_t state; /** Transfer state */ uint8_t state; /* Transfer state */
int8_t status; /** Last transfer status */ int8_t status; /* Last transfer status */
}; };
/** /* General transfer descriptor */
* General transfer descriptor
*/
struct usb_h_xfer struct usb_h_xfer
{ {
/** Reserved for different transfer */ /* Reserved for different transfer */
union union
{ {
uint16_t u16[9]; uint16_t u16[9];
uint8_t u8[18]; uint8_t u8[18];
} reserved; } reserved;
uint8_t state; /** Transfer state */ uint8_t state; /* Transfer state */
int8_t status; /** Last transfer status */ int8_t status; /* Last transfer status */
}; };
/* USB Host Controller Driver Pipe structure */ /* USB Host Controller Driver Pipe structure */
@@ -609,7 +600,7 @@ struct sam_pipe_s
uint8_t dma : 1; /* Uses DMA (on transfer) */ uint8_t dma : 1; /* Uses DMA (on transfer) */
uint8_t periodic_start : 1; /* Transfer periodic */ uint8_t periodic_start : 1; /* Transfer periodic */
/** Transfer status */ /* Transfer status */
union union
{ {
@@ -650,12 +641,12 @@ struct sam_usbhost_s
uint8_t xfrtype; /* See enum _hxfrdn_e */ uint8_t xfrtype; /* See enum _hxfrdn_e */
sem_t pscsem; /* Semaphore to wait for a port event */ sem_t pscsem; /* Semaphore to wait for a port event */
uint16_t pipes_unfreeze; /** Pipes to unfreeze after wakeup */ uint16_t pipes_unfreeze; /* Pipes to unfreeze after wakeup */
int8_t suspend_start; /** Delayed suspend time in ms */ int8_t suspend_start; /* Delayed suspend time in ms */
int8_t resume_start; /** Delayed resume time in ms */ int8_t resume_start; /* Delayed resume time in ms */
int8_t n_ctrl_req_user; /** Control transfer request user count */ int8_t n_ctrl_req_user; /* Control transfer request user count */
int8_t n_sof_user; /** SOF user count (callback, suspend, resume, ctrl request) */ int8_t n_sof_user; /* SOF user count (callback, suspend, resume, ctrl request) */
uint8_t pipe_pool_size; /** Pipe pool size in number of pipes */ uint8_t pipe_pool_size; /* Pipe pool size in number of pipes */
#ifdef CONFIG_USBHOST_HUB #ifdef CONFIG_USBHOST_HUB
arch/arm/src/samd5e5/sam_wdt.c
+1 -1
View File
@@ -54,7 +54,7 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/** N clock cycles */ /* N clock cycles */
#define WDT_CLK_8CYCLE 8 #define WDT_CLK_8CYCLE 8
#define WDT_CLK_16CYCLE 16 #define WDT_CLK_16CYCLE 16
arch/arm/src/stm32/stm32_waste.h
+8 -8
View File
@@ -42,16 +42,16 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
/** Waste CPU Time /* Waste CPU Time
* *
* stm32_waste() is the logic that will be executed when portions of kernel * stm32_waste() is the logic that will be executed when portions of kernel
* or user-app is polling some register or similar, waiting for desired * or user-app is polling some register or similar, waiting for desired
* status. This time is wasted away. This function offers a measure of * status. This time is wasted away. This function offers a measure of
* badly written piece of software or some undesired behavior. * badly written piece of software or some undesired behavior.
* *
* At the same time this function adds to some IDLE time which portion * At the same time this function adds to some IDLE time which portion
* cannot be used for other purposes (yet). * cannot be used for other purposes (yet).
**/ */
void stm32_waste(void); void stm32_waste(void);
arch/arm/src/stm32f7/stm32_waste.h
+8 -8
View File
@@ -42,16 +42,16 @@ extern "C"
* Public Function Prototypes * Public Function Prototypes
****************************************************************************/ ****************************************************************************/
/** Waste CPU Time /* Waste CPU Time
* *
* stm32_waste() is the logic that will be executed when portions of kernel * stm32_waste() is the logic that will be executed when portions of kernel
* or user-app is polling some register or similar, waiting for desired * or user-app is polling some register or similar, waiting for desired
* status. This time is wasted away. This function offers a measure of * status. This time is wasted away. This function offers a measure of
* badly written piece of software or some undesired behavior. * badly written piece of software or some undesired behavior.
* *
* At the same time this function adds to some IDLE time which portion * At the same time this function adds to some IDLE time which portion
* cannot be used for other purposes (yet). * cannot be used for other purposes (yet).
**/ */
void stm32_waste(void); void stm32_waste(void);
arch/risc-v/src/esp32c3/hardware/esp32c3_saradc.h
+86 -86
View File
File diff suppressed because it is too large Load Diff
arch/risc-v/src/esp32c3/hardware/esp32c3_usb_serial_jtag.h
+39 -39
View File
@@ -31,10 +31,10 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/** Configuration Registers */ /* Configuration Registers */
/** USB_SERIAL_JTAG_EP1_REG register /* USB_SERIAL_JTAG_EP1_REG register
* USB_SERIAL_JTAG_EP1_REG. * USB_SERIAL_JTAG_EP1_REG.
*/ */
#define USB_SERIAL_JTAG_EP1_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x0) #define USB_SERIAL_JTAG_EP1_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x0)
@@ -55,8 +55,8 @@
#define USB_SERIAL_JTAG_RDWR_BYTE_V 0x000000ff #define USB_SERIAL_JTAG_RDWR_BYTE_V 0x000000ff
#define USB_SERIAL_JTAG_RDWR_BYTE_S 0 #define USB_SERIAL_JTAG_RDWR_BYTE_S 0
/** USB_SERIAL_JTAG_CONF0_REG register /* USB_SERIAL_JTAG_CONF0_REG register
* USB_SERIAL_JTAG_CONF0_REG. * USB_SERIAL_JTAG_CONF0_REG.
*/ */
#define USB_SERIAL_JTAG_CONF0_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x18) #define USB_SERIAL_JTAG_CONF0_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x18)
@@ -191,8 +191,8 @@
#define USB_SERIAL_JTAG_USB_PAD_ENABLE_V 0x00000001 #define USB_SERIAL_JTAG_USB_PAD_ENABLE_V 0x00000001
#define USB_SERIAL_JTAG_USB_PAD_ENABLE_S 14 #define USB_SERIAL_JTAG_USB_PAD_ENABLE_S 14
/** USB_SERIAL_JTAG_TEST_REG register /* USB_SERIAL_JTAG_TEST_REG register
* USB_SERIAL_JTAG_TEST_REG. * USB_SERIAL_JTAG_TEST_REG.
*/ */
#define USB_SERIAL_JTAG_TEST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x1c) #define USB_SERIAL_JTAG_TEST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x1c)
@@ -237,8 +237,8 @@
#define USB_SERIAL_JTAG_TEST_TX_DM_V 0x00000001 #define USB_SERIAL_JTAG_TEST_TX_DM_V 0x00000001
#define USB_SERIAL_JTAG_TEST_TX_DM_S 3 #define USB_SERIAL_JTAG_TEST_TX_DM_S 3
/** USB_SERIAL_JTAG_MISC_CONF_REG register /* USB_SERIAL_JTAG_MISC_CONF_REG register
* USB_SERIAL_JTAG_MISC_CONF_REG. * USB_SERIAL_JTAG_MISC_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_MISC_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x44) #define USB_SERIAL_JTAG_MISC_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x44)
@@ -254,8 +254,8 @@
#define USB_SERIAL_JTAG_CLK_EN_V 0x00000001 #define USB_SERIAL_JTAG_CLK_EN_V 0x00000001
#define USB_SERIAL_JTAG_CLK_EN_S 0 #define USB_SERIAL_JTAG_CLK_EN_S 0
/** USB_SERIAL_JTAG_MEM_CONF_REG register /* USB_SERIAL_JTAG_MEM_CONF_REG register
* USB_SERIAL_JTAG_MEM_CONF_REG. * USB_SERIAL_JTAG_MEM_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_MEM_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x48) #define USB_SERIAL_JTAG_MEM_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x48)
@@ -280,10 +280,10 @@
#define USB_SERIAL_JTAG_USB_MEM_CLK_EN_V 0x00000001 #define USB_SERIAL_JTAG_USB_MEM_CLK_EN_V 0x00000001
#define USB_SERIAL_JTAG_USB_MEM_CLK_EN_S 1 #define USB_SERIAL_JTAG_USB_MEM_CLK_EN_S 1
/** Status Registers */ /* Status Registers */
/** USB_SERIAL_JTAG_EP1_CONF_REG register /* USB_SERIAL_JTAG_EP1_CONF_REG register
* USB_SERIAL_JTAG_EP1_CONF_REG. * USB_SERIAL_JTAG_EP1_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_EP1_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x4) #define USB_SERIAL_JTAG_EP1_CONF_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x4)
@@ -321,8 +321,8 @@
#define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_V 0x00000001 #define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_V 0x00000001
#define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_S 2 #define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_S 2
/** USB_SERIAL_JTAG_JFIFO_ST_REG register /* USB_SERIAL_JTAG_JFIFO_ST_REG register
* USB_SERIAL_JTAG_JFIFO_ST_REG. * USB_SERIAL_JTAG_JFIFO_ST_REG.
*/ */
#define USB_SERIAL_JTAG_JFIFO_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x20) #define USB_SERIAL_JTAG_JFIFO_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x20)
@@ -406,8 +406,8 @@
#define USB_SERIAL_JTAG_OUT_FIFO_RESET_V 0x00000001 #define USB_SERIAL_JTAG_OUT_FIFO_RESET_V 0x00000001
#define USB_SERIAL_JTAG_OUT_FIFO_RESET_S 9 #define USB_SERIAL_JTAG_OUT_FIFO_RESET_S 9
/** USB_SERIAL_JTAG_FRAM_NUM_REG register /* USB_SERIAL_JTAG_FRAM_NUM_REG register
* USB_SERIAL_JTAG_FRAM_NUM_REG. * USB_SERIAL_JTAG_FRAM_NUM_REG.
*/ */
#define USB_SERIAL_JTAG_FRAM_NUM_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x24) #define USB_SERIAL_JTAG_FRAM_NUM_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x24)
@@ -422,8 +422,8 @@
#define USB_SERIAL_JTAG_SOF_FRAME_INDEX_V 0x000007ff #define USB_SERIAL_JTAG_SOF_FRAME_INDEX_V 0x000007ff
#define USB_SERIAL_JTAG_SOF_FRAME_INDEX_S 0 #define USB_SERIAL_JTAG_SOF_FRAME_INDEX_S 0
/** USB_SERIAL_JTAG_IN_EP0_ST_REG register /* USB_SERIAL_JTAG_IN_EP0_ST_REG register
* USB_SERIAL_JTAG_IN_EP0_ST_REG. * USB_SERIAL_JTAG_IN_EP0_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP0_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x28) #define USB_SERIAL_JTAG_IN_EP0_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x28)
@@ -455,8 +455,8 @@
#define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP1_ST_REG register /* USB_SERIAL_JTAG_IN_EP1_ST_REG register
* USB_SERIAL_JTAG_IN_EP1_ST_REG. * USB_SERIAL_JTAG_IN_EP1_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP1_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x2c) #define USB_SERIAL_JTAG_IN_EP1_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x2c)
@@ -489,8 +489,8 @@
#define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP2_ST_REG register /* USB_SERIAL_JTAG_IN_EP2_ST_REG register
* USB_SERIAL_JTAG_IN_EP2_ST_REG. * USB_SERIAL_JTAG_IN_EP2_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP2_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x30) #define USB_SERIAL_JTAG_IN_EP2_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x30)
@@ -525,8 +525,8 @@
#define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP3_ST_REG register /* USB_SERIAL_JTAG_IN_EP3_ST_REG register
* USB_SERIAL_JTAG_IN_EP3_ST_REG. * USB_SERIAL_JTAG_IN_EP3_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP3_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x34) #define USB_SERIAL_JTAG_IN_EP3_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x34)
@@ -561,8 +561,8 @@
#define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_S 9
/** USB_SERIAL_JTAG_OUT_EP0_ST_REG register /* USB_SERIAL_JTAG_OUT_EP0_ST_REG register
* USB_SERIAL_JTAG_OUT_EP0_ST_REG. * USB_SERIAL_JTAG_OUT_EP0_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP0_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x38) #define USB_SERIAL_JTAG_OUT_EP0_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x38)
@@ -599,8 +599,8 @@
#define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_S 9 #define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_S 9
/** USB_SERIAL_JTAG_OUT_EP1_ST_REG register /* USB_SERIAL_JTAG_OUT_EP1_ST_REG register
* USB_SERIAL_JTAG_OUT_EP1_ST_REG. * USB_SERIAL_JTAG_OUT_EP1_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP1_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x3c) #define USB_SERIAL_JTAG_OUT_EP1_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x3c)
@@ -647,8 +647,8 @@
#define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_S 16 #define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_S 16
/** USB_SERIAL_JTAG_OUT_EP2_ST_REG register /* USB_SERIAL_JTAG_OUT_EP2_ST_REG register
* USB_SERIAL_JTAG_OUT_EP2_ST_REG. * USB_SERIAL_JTAG_OUT_EP2_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP2_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x40) #define USB_SERIAL_JTAG_OUT_EP2_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x40)
@@ -685,10 +685,10 @@
#define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_S 9 #define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_S 9
/** Interrupt Registers */ /* Interrupt Registers */
/** USB_SERIAL_JTAG_INT_RAW_REG register /* USB_SERIAL_JTAG_INT_RAW_REG register
* USB_SERIAL_JTAG_INT_RAW_REG. * USB_SERIAL_JTAG_INT_RAW_REG.
*/ */
#define USB_SERIAL_JTAG_INT_RAW_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x8) #define USB_SERIAL_JTAG_INT_RAW_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x8)
@@ -824,8 +824,8 @@
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_V 0x00000001 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_V 0x00000001
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_S 11 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_S 11
/** USB_SERIAL_JTAG_INT_ST_REG register /* USB_SERIAL_JTAG_INT_ST_REG register
* USB_SERIAL_JTAG_INT_ST_REG. * USB_SERIAL_JTAG_INT_ST_REG.
*/ */
#define USB_SERIAL_JTAG_INT_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0xc) #define USB_SERIAL_JTAG_INT_ST_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0xc)
@@ -955,8 +955,8 @@
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_V 0x00000001 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_V 0x00000001
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_S 11 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_S 11
/** USB_SERIAL_JTAG_INT_ENA_REG register /* USB_SERIAL_JTAG_INT_ENA_REG register
* USB_SERIAL_JTAG_INT_ENA_REG. * USB_SERIAL_JTAG_INT_ENA_REG.
*/ */
#define USB_SERIAL_JTAG_INT_ENA_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x10) #define USB_SERIAL_JTAG_INT_ENA_REG (DR_REG_USB_SERIAL_JTAG_BASE + 0x10)
arch/sparc/include/sparc_v8/irq.h
+68 -101
View File
@@ -100,6 +100,7 @@
#define XCPTCONTEXT_REGS (68) #define XCPTCONTEXT_REGS (68)
#define XCPTCONTEXT_SIZE (4 * XCPTCONTEXT_REGS) #define XCPTCONTEXT_SIZE (4 * XCPTCONTEXT_REGS)
/* Alternate register names *************************************************/ /* Alternate register names *************************************************/
/* %psr: processor status register */ /* %psr: processor status register */
@@ -211,69 +212,67 @@
#define SPARC_SWTRAP_SYSCALL 0 #define SPARC_SWTRAP_SYSCALL 0
#define SPARC_SWTRAP_IRQDIS 9 #define SPARC_SWTRAP_IRQDIS 9
#define SPARC_SWTRAP_IRQEN 10 #define SPARC_SWTRAP_IRQEN 10
/** /* PSR masks and starting bit positions
* PSR masks and starting bit positions
*
* NOTE: Reserved bits are ignored. * NOTE: Reserved bits are ignored.
*/ */
#define SPARC_PSR_CWP_MASK 0x00000007 /* bits 0 - 4 */ #define SPARC_PSR_CWP_MASK 0x00000007 /* bits 0 - 4 */
/** This constant is a mask for the ET bits in the PSR. */ /* This constant is a mask for the ET bits in the PSR. */
#define SPARC_PSR_ET_MASK 0x00000020 /* bit 5 */ #define SPARC_PSR_ET_MASK 0x00000020 /* bit 5 */
/** This constant is a mask for the PS bits in the PSR. */ /* This constant is a mask for the PS bits in the PSR. */
#define SPARC_PSR_PS_MASK 0x00000040 /* bit 6 */ #define SPARC_PSR_PS_MASK 0x00000040 /* bit 6 */
/** This constant is a mask for the S bits in the PSR. */ /* This constant is a mask for the S bits in the PSR. */
#define SPARC_PSR_S_MASK 0x00000080 /* bit 7 */ #define SPARC_PSR_S_MASK 0x00000080 /* bit 7 */
/** This constant is a mask for the PIL bits in the PSR. */ /* This constant is a mask for the PIL bits in the PSR. */
#define SPARC_PSR_PIL_MASK 0x00000F00 /* bits 8 - 11 */ #define SPARC_PSR_PIL_MASK 0x00000F00 /* bits 8 - 11 */
/** This constant is a mask for the EF bits in the PSR. */ /* This constant is a mask for the EF bits in the PSR. */
#define SPARC_PSR_EF_MASK 0x00001000 /* bit 12 */ #define SPARC_PSR_EF_MASK 0x00001000 /* bit 12 */
/** This constant is a mask for the EC bits in the PSR. */ /* This constant is a mask for the EC bits in the PSR. */
#define SPARC_PSR_EC_MASK 0x00002000 /* bit 13 */ #define SPARC_PSR_EC_MASK 0x00002000 /* bit 13 */
/** This constant is a mask for the ICC bits in the PSR. */ /* This constant is a mask for the ICC bits in the PSR. */
#define SPARC_PSR_ICC_MASK 0x00F00000 /* bits 20 - 23 */ #define SPARC_PSR_ICC_MASK 0x00F00000 /* bits 20 - 23 */
/** This constant is a mask for the VER bits in the PSR. */ /* This constant is a mask for the VER bits in the PSR. */
#define SPARC_PSR_VER_MASK 0x0F000000 /* bits 24 - 27 */ #define SPARC_PSR_VER_MASK 0x0F000000 /* bits 24 - 27 */
/** This constant is a mask for the IMPL bits in the PSR. */ /* This constant is a mask for the IMPL bits in the PSR. */
#define SPARC_PSR_IMPL_MASK 0xF0000000 /* bits 28 - 31 */ #define SPARC_PSR_IMPL_MASK 0xF0000000 /* bits 28 - 31 */
/** This constant is the starting bit position of the CWP in the PSR. */ /* This constant is the starting bit position of the CWP in the PSR. */
#define SPARC_PSR_CWP_BIT_POSITION 0 /* bits 0 - 4 */ #define SPARC_PSR_CWP_BIT_POSITION 0 /* bits 0 - 4 */
/** This constant is the starting bit position of the ET in the PSR. */ /* This constant is the starting bit position of the ET in the PSR. */
#define SPARC_PSR_ET_BIT_POSITION 5 /* bit 5 */ #define SPARC_PSR_ET_BIT_POSITION 5 /* bit 5 */
/** This constant is the starting bit position of the PS in the PSR. */ /* This constant is the starting bit position of the PS in the PSR. */
#define SPARC_PSR_PS_BIT_POSITION 6 /* bit 6 */ #define SPARC_PSR_PS_BIT_POSITION 6 /* bit 6 */
/** This constant is the starting bit position of the S in the PSR. */ /* This constant is the starting bit position of the S in the PSR. */
#define SPARC_PSR_S_BIT_POSITION 7 /* bit 7 */ #define SPARC_PSR_S_BIT_POSITION 7 /* bit 7 */
/** This constant is the starting bit position of the PIL in the PSR. */ /* This constant is the starting bit position of the PIL in the PSR. */
#define SPARC_PSR_PIL_BIT_POSITION 8 /* bits 8 - 11 */ #define SPARC_PSR_PIL_BIT_POSITION 8 /* bits 8 - 11 */
/** This constant is the starting bit position of the EF in the PSR. */ /* This constant is the starting bit position of the EF in the PSR. */
#define SPARC_PSR_EF_BIT_POSITION 12 /* bit 12 */ #define SPARC_PSR_EF_BIT_POSITION 12 /* bit 12 */
/** This constant is the starting bit position of the EC in the PSR. */ /* This constant is the starting bit position of the EC in the PSR. */
#define SPARC_PSR_EC_BIT_POSITION 13 /* bit 13 */ #define SPARC_PSR_EC_BIT_POSITION 13 /* bit 13 */
/** This constant is the starting bit position of the ICC in the PSR. */ /* This constant is the starting bit position of the ICC in the PSR. */
#define SPARC_PSR_ICC_BIT_POSITION 20 /* bits 20 - 23 */ #define SPARC_PSR_ICC_BIT_POSITION 20 /* bits 20 - 23 */
/** This constant is the starting bit position of the VER in the PSR. */ /* This constant is the starting bit position of the VER in the PSR. */
#define SPARC_PSR_VER_BIT_POSITION 24 /* bits 24 - 27 */ #define SPARC_PSR_VER_BIT_POSITION 24 /* bits 24 - 27 */
/** This constant is the starting bit position of the IMPL in the PSR. */ /* This constant is the starting bit position of the IMPL in the PSR. */
#define SPARC_PSR_IMPL_BIT_POSITION 28 /* bits 28 - 31 */ #define SPARC_PSR_IMPL_BIT_POSITION 28 /* bits 28 - 31 */
#define SPARC_NUMBER_OF_REGISTER_WINDOWS 8 #define SPARC_NUMBER_OF_REGISTER_WINDOWS 8
@@ -296,20 +295,20 @@
#define CPU_STACK_FRAME_PAD0_OFFSET 0x5c #define CPU_STACK_FRAME_PAD0_OFFSET 0x5c
#define CPU_MINIMUM_STACK_FRAME_SIZE 0x60 #define CPU_MINIMUM_STACK_FRAME_SIZE 0x60
#define ISF_STACK_FRAME_OFFSET 0x00 #define ISF_STACK_FRAME_OFFSET 0x00
#define ISF_PSR_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x00) #define ISF_PSR_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x00)
#define ISF_PC_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x04) #define ISF_PC_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x04)
#define ISF_NPC_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x08) #define ISF_NPC_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x08)
#define ISF_G1_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x0c) #define ISF_G1_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x0c)
#define ISF_G2_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x10) #define ISF_G2_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x10)
#define ISF_G4_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x18) #define ISF_G4_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x18)
#define ISF_G6_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x20) #define ISF_G6_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x20)
#define ISF_I0_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x28) #define ISF_I0_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x28)
#define ISF_I2_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x30) #define ISF_I2_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x30)
#define ISF_I4_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x38) #define ISF_I4_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x38)
#define ISF_I6_FP_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x40) #define ISF_I6_FP_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x40)
#define ISF_Y_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x48) #define ISF_Y_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x48)
#define ISF_FSR_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x4c) #define ISF_FSR_OFFSET (CPU_MINIMUM_STACK_FRAME_SIZE + 0x4c)
@@ -335,46 +334,46 @@
#define CONTEXT_CONTROL_INTERRUPT_FRAME_SIZE (CPU_MINIMUM_STACK_FRAME_SIZE + 0x50 + 32*4) #define CONTEXT_CONTROL_INTERRUPT_FRAME_SIZE (CPU_MINIMUM_STACK_FRAME_SIZE + 0x50 + 32*4)
/* Offsets of fields with Context_Control for assembly routines. */ /* Offsets of fields with Context_Control for assembly routines. */
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define PSR_OFFSET 0x00 #define PSR_OFFSET 0x00
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define PC_OFFSET 0x04 #define PC_OFFSET 0x04
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define NPC_OFFSET 0x08 #define NPC_OFFSET 0x08
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G1_OFFSET 0x0C #define G1_OFFSET 0x0C
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G2_OFFSET 0x10 #define G2_OFFSET 0x10
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G3_OFFSET 0x14 #define G3_OFFSET 0x14
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G4_OFFSET 0x18 #define G4_OFFSET 0x18
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G5_OFFSET 0x1C #define G5_OFFSET 0x1C
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G6_OFFSET 0x20 #define G6_OFFSET 0x20
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define G7_OFFSET 0x24 #define G7_OFFSET 0x24
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O0_OFFSET 0x28 #define O0_OFFSET 0x28
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O1_OFFSET 0x2C #define O1_OFFSET 0x2C
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O2_OFFSET 0x30 #define O2_OFFSET 0x30
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O3_OFFSET 0x34 #define O3_OFFSET 0x34
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O4_OFFSET 0x38 #define O4_OFFSET 0x38
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O5_OFFSET 0x3C #define O5_OFFSET 0x3C
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O6_SP_OFFSET 0x40 #define O6_SP_OFFSET 0x40
/** This macro defines an offset into the context for use in assembly. */ /* This macro defines an offset into the context for use in assembly. */
#define O7_OFFSET 0x44 #define O7_OFFSET 0x44
#define Y_OFFSET 0x48 #define Y_OFFSET 0x48
@@ -401,8 +400,7 @@
#define F30_OFFSET 0xc8 #define F30_OFFSET 0xc8
#if ( SPARC_HAS_FPU == 1 ) #if ( SPARC_HAS_FPU == 1 )
/** /* Offset of the CPU_Per_CPU_control::fsr field relative to the
* @brief Offset of the CPU_Per_CPU_control::fsr field relative to the
* Per_CPU_Control begin. * Per_CPU_Control begin.
*/ */
#define SPARC_PER_CPU_FSR_OFFSET 4 #define SPARC_PER_CPU_FSR_OFFSET 4
@@ -477,9 +475,7 @@ struct xcptcontext
* Inline functions * Inline functions
****************************************************************************/ ****************************************************************************/
/** /* Macro to set the PSR.
* @brief Macro to set the PSR.
*
* This macro sets the PSR register to the value in @a _psr. * This macro sets the PSR register to the value in @a _psr.
*/ */
#define sparc_set_psr( _psr ) \ #define sparc_set_psr( _psr ) \
@@ -490,9 +486,7 @@ struct xcptcontext
nop(); \ nop(); \
} while ( 0 ) } while ( 0 )
/** /* Macro to obtain the PSR.
* @brief Macro to obtain the PSR.
*
* This macro returns the current contents of the PSR register in @a _psr. * This macro returns the current contents of the PSR register in @a _psr.
*/ */
#define sparc_get_psr( _psr ) \ #define sparc_get_psr( _psr ) \
@@ -501,17 +495,14 @@ struct xcptcontext
__asm__ volatile( "rd %%psr, %0" : "=r" (_psr) : "0" (_psr) ); \ __asm__ volatile( "rd %%psr, %0" : "=r" (_psr) : "0" (_psr) ); \
} while ( 0 ) } while ( 0 )
/** /* This macro is a standard nop instruction.
* This macro is a standard nop instruction.
*/ */
#define nop() \ #define nop() \
do { \ do { \
__asm__ volatile ( "nop" ); \ __asm__ volatile ( "nop" ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to obtain the TBR.
* @brief Macro to obtain the TBR.
*
* This macro returns the current contents of the TBR register in @a _tbr. * This macro returns the current contents of the TBR register in @a _tbr.
*/ */
#define sparc_get_tbr( _tbr ) \ #define sparc_get_tbr( _tbr ) \
@@ -520,9 +511,7 @@ struct xcptcontext
__asm__ volatile( "rd %%tbr, %0" : "=r" (_tbr) : "0" (_tbr) ); \ __asm__ volatile( "rd %%tbr, %0" : "=r" (_tbr) : "0" (_tbr) ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to set the TBR.
* @brief Macro to set the TBR.
*
* This macro sets the TBR register to the value in @a _tbr. * This macro sets the TBR register to the value in @a _tbr.
*/ */
#define sparc_set_tbr( _tbr ) \ #define sparc_set_tbr( _tbr ) \
@@ -530,9 +519,7 @@ struct xcptcontext
__asm__ volatile( "wr %0, 0, %%tbr" : "=r" (_tbr) : "0" (_tbr) ); \ __asm__ volatile( "wr %0, 0, %%tbr" : "=r" (_tbr) : "0" (_tbr) ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to obtain the WIM.
* @brief Macro to obtain the WIM.
*
* This macro returns the current contents of the WIM field in @a _wim. * This macro returns the current contents of the WIM field in @a _wim.
*/ */
#define sparc_get_wim( _wim ) \ #define sparc_get_wim( _wim ) \
@@ -540,9 +527,7 @@ struct xcptcontext
__asm__ volatile( "rd %%wim, %0" : "=r" (_wim) : "0" (_wim) ); \ __asm__ volatile( "rd %%wim, %0" : "=r" (_wim) : "0" (_wim) ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to set the WIM.
* @brief Macro to set the WIM.
*
* This macro sets the WIM field to the value in @a _wim. * This macro sets the WIM field to the value in @a _wim.
*/ */
#define sparc_set_wim( _wim ) \ #define sparc_set_wim( _wim ) \
@@ -553,9 +538,7 @@ struct xcptcontext
nop(); \ nop(); \
} while ( 0 ) } while ( 0 )
/** /* Macro to obtain the Y register.
* @brief Macro to obtain the Y register.
*
* This macro returns the current contents of the Y register in @a _y. * This macro returns the current contents of the Y register in @a _y.
*/ */
#define sparc_get_y( _y ) \ #define sparc_get_y( _y ) \
@@ -563,9 +546,7 @@ struct xcptcontext
__asm__ volatile( "rd %%y, %0" : "=r" (_y) : "0" (_y) ); \ __asm__ volatile( "rd %%y, %0" : "=r" (_y) : "0" (_y) ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to set the Y register.
* @brief Macro to set the Y register.
*
* This macro sets the Y register to the value in @a _y. * This macro sets the Y register to the value in @a _y.
*/ */
#define sparc_set_y( _y ) \ #define sparc_set_y( _y ) \
@@ -573,9 +554,7 @@ struct xcptcontext
__asm__ volatile( "wr %0, %%y" : "=r" (_y) : "0" (_y) ); \ __asm__ volatile( "wr %0, %%y" : "=r" (_y) : "0" (_y) ); \
} while ( 0 ) } while ( 0 )
/** /* Macro to obtain the asr17.
* @brief Macro to obtain the asr17.
*
* This macro returns the current contents of the asr17 register in _asr17. * This macro returns the current contents of the asr17 register in _asr17.
*/ */
#define sparc_get_asr17( _asr17 ) \ #define sparc_get_asr17( _asr17 ) \
@@ -584,11 +563,8 @@ struct xcptcontext
__asm__ volatile( "rd %%asr17, %0" : "=r" (_asr17) : "0" (_asr17) ); \ __asm__ volatile( "rd %%asr17, %0" : "=r" (_asr17) : "0" (_asr17) ); \
} while ( 0 ) } while ( 0 )
/** /* SPARC disable processor interrupts.
* @brief SPARC disable processor interrupts.
*
* This method is invoked to disable all maskable interrupts. * This method is invoked to disable all maskable interrupts.
*
* @return This method returns the entire PSR contents. * @return This method returns the entire PSR contents.
*/ */
@@ -599,11 +575,8 @@ static inline uint32_t sparc_disable_interrupts(void)
return psr; return psr;
} }
/** /* SPARC enable processor interrupts.
* @brief SPARC enable processor interrupts.
*
* This method is invoked to enable all maskable interrupts. * This method is invoked to enable all maskable interrupts.
*
* @param[in] psr is the PSR returned by @ref sparc_disable_interrupts. * @param[in] psr is the PSR returned by @ref sparc_disable_interrupts.
*/ */
@@ -620,11 +593,8 @@ static inline void sparc_enable_interrupts(uint32_t psr)
__asm__ volatile ("ta %0\nnop\n" :: "i" (SPARC_SWTRAP_IRQEN), "r" (_psr)); __asm__ volatile ("ta %0\nnop\n" :: "i" (SPARC_SWTRAP_IRQEN), "r" (_psr));
} }
/** /* SPARC flash processor interrupts.
* @brief SPARC flash processor interrupts.
*
* This method is invoked to temporarily enable all maskable interrupts. * This method is invoked to temporarily enable all maskable interrupts.
*
* @param[in] _psr is the PSR returned by @ref sparc_disable_interrupts. * @param[in] _psr is the PSR returned by @ref sparc_disable_interrupts.
*/ */
@@ -634,11 +604,8 @@ static inline void sparc_enable_interrupts(uint32_t psr)
_psr = sparc_disable_interrupts(); \ _psr = sparc_disable_interrupts(); \
} while ( 0 ) } while ( 0 )
/** /* SPARC obtain interrupt level.
* @brief SPARC obtain interrupt level.
*
* This method is invoked to obtain the current interrupt disable level. * This method is invoked to obtain the current interrupt disable level.
*
* @param[in] _level is the PSR returned by @ref sparc_disable_interrupts. * @param[in] _level is the PSR returned by @ref sparc_disable_interrupts.
*/ */
arch/sparc/src/bm3803/bm3803-uart.h
+17 -17
View File
@@ -67,16 +67,16 @@
/* Register Bit-Field Definitions *******************************************/ /* Register Bit-Field Definitions *******************************************/
#define ODD 1 #define ODD 1
#define EVEN 0 #define EVEN 0
#define ON 1 #define ON 1
#define OFF 0 #define OFF 0
#define NONE 2 #define NONE 2
#define RX 0 #define RX 0
#define TX 1 #define TX 1
#define RXTX 3 #define RXTX 3
/** Uart control list - Mask */ /* Uart control list - Mask */
#define MSK_UART_ENABLE_RX 0x01 #define MSK_UART_ENABLE_RX 0x01
#define MSK_UART_ENABLE_TX 0x02 #define MSK_UART_ENABLE_TX 0x02
@@ -109,9 +109,9 @@
#define UART_BRG_MASK 0xfff #define UART_BRG_MASK 0xfff
#define uart1_set_baudrate(baudrate) (BM3803_REG.uart_scaler1 = (uint32_t)((((BOARD_CPU_CLOCK*10)/(baudrate * 8))-5)/10)) #define uart1_set_baudrate(baudrate) (BM3803_REG.uart_scaler1 = (uint32_t)((((BOARD_CPU_CLOCK*10)/(baudrate * 8))-5)/10))
#define uart1_parity_config(uart_parity) ( uart_parity == ODD \ #define uart1_parity_config(uart_parity) ( uart_parity == ODD \
? (BM3803_REG.uart_ctrl1 = ((BM3803_REG.uart_ctrl1 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl1 = ((BM3803_REG.uart_ctrl1 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
: ( uart_parity == EVEN \ : ( uart_parity == EVEN \
? (BM3803_REG.uart_ctrl1 = ((BM3803_REG.uart_ctrl1 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl1 = ((BM3803_REG.uart_ctrl1 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
@@ -130,12 +130,12 @@
) \ ) \
) )
#define uart1_flow_ctrl_config(uart_flow) ( uart_flow == ON \ #define uart1_flow_ctrl_config(uart_flow) ( uart_flow == ON \
? (BM3803_REG.uart_ctrl1 |= MSK_UART_ENABLE_FLOW) \ ? (BM3803_REG.uart_ctrl1 |= MSK_UART_ENABLE_FLOW) \
: (BM3803_REG.uart_ctrl1 &= ~MSK_UART_ENABLE_FLOW) \ : (BM3803_REG.uart_ctrl1 &= ~MSK_UART_ENABLE_FLOW) \
) )
#define uart1_loopback_config(uart_loopb) ( uart_loopb == ON \ #define uart1_loopback_config(uart_loopb) ( uart_loopb == ON \
? (BM3803_REG.uart_ctrl1 |= MSK_UART_LOOPBACK) \ ? (BM3803_REG.uart_ctrl1 |= MSK_UART_LOOPBACK) \
: (BM3803_REG.uart_ctrl1 &= ~MSK_UART_LOOPBACK) \ : (BM3803_REG.uart_ctrl1 &= ~MSK_UART_LOOPBACK) \
) )
@@ -146,11 +146,11 @@
#define uart1_tx_ready() ((BM3803_REG.uart_status1 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY ) #define uart1_tx_ready() ((BM3803_REG.uart_status1 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY )
#define uart1_rx_ready() ((BM3803_REG.uart_status1 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY) #define uart1_rx_ready() ((BM3803_REG.uart_status1 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY)
#define uart1_send_byte(ch) (BM3803_REG.uart_data1 = ch) #define uart1_send_byte(ch) (BM3803_REG.uart_data1 = ch)
#define uart2_set_baudrate(baudrate) (BM3803_REG.uart_scaler2 = (((BOARD_CPU_CLOCK*10)/(baudrate*8))-5)/10) #define uart2_set_baudrate(baudrate) (BM3803_REG.uart_scaler2 = (((BOARD_CPU_CLOCK*10)/(baudrate*8))-5)/10)
#define uart2_parity_config(uart_parity) ( uart_parity == ODD \ #define uart2_parity_config(uart_parity) ( uart_parity == ODD \
? (BM3803_REG.uart_ctrl2 = ((BM3803_REG.uart_ctrl2 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl2 = ((BM3803_REG.uart_ctrl2 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
: ( uart_parity == EVEN \ : ( uart_parity == EVEN \
? (BM3803_REG.uart_ctrl2 = ((BM3803_REG.uart_ctrl2 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl2 = ((BM3803_REG.uart_ctrl2 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
@@ -158,12 +158,12 @@
) \ ) \
) )
#define uart2_flow_ctrl_config(uart_flow) ( uart_flow == ON \ #define uart2_flow_ctrl_config(uart_flow) ( uart_flow == ON \
? (BM3803_REG.uart_ctrl2 |= MSK_UART_ENABLE_FLOW) \ ? (BM3803_REG.uart_ctrl2 |= MSK_UART_ENABLE_FLOW) \
: (BM3803_REG.uart_ctrl2 &= ~MSK_UART_ENABLE_FLOW) \ : (BM3803_REG.uart_ctrl2 &= ~MSK_UART_ENABLE_FLOW) \
) )
#define uart2_loopback_config(uart_loopb) ( uart_loopb == ON \ #define uart2_loopback_config(uart_loopb) ( uart_loopb == ON \
? (BM3803_REG.uart_ctrl2 |= MSK_UART_LOOPBACK) \ ? (BM3803_REG.uart_ctrl2 |= MSK_UART_LOOPBACK) \
: (BM3803_REG.uart_ctrl2 &= ~MSK_UART_LOOPBACK) \ : (BM3803_REG.uart_ctrl2 &= ~MSK_UART_LOOPBACK) \
) )
@@ -174,11 +174,11 @@
#define uart2_tx_ready() ((BM3803_REG.uart_status2 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY ) #define uart2_tx_ready() ((BM3803_REG.uart_status2 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY )
#define uart2_rx_ready() ((BM3803_REG.uart_status2 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY) #define uart2_rx_ready() ((BM3803_REG.uart_status2 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY)
#define uart2_send_byte(ch) (BM3803_REG.uart_data2 = ch) #define uart2_send_byte(ch) (BM3803_REG.uart_data2 = ch)
#define uart3_set_baudrate(baudrate) (BM3803_REG.uart_scaler3 = (((BOARD_CPU_CLOCK*10)/(baudrate*8))-5)/10) #define uart3_set_baudrate(baudrate) (BM3803_REG.uart_scaler3 = (((BOARD_CPU_CLOCK*10)/(baudrate*8))-5)/10)
#define uart3_parity_config(uart_parity) ( uart_parity == ODD \ #define uart3_parity_config(uart_parity) ( uart_parity == ODD \
? (BM3803_REG.uart_ctrl3 = ((BM3803_REG.uart_ctrl3 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl3 = ((BM3803_REG.uart_ctrl3 | MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
: ( uart_parity == EVEN \ : ( uart_parity == EVEN \
? (BM3803_REG.uart_ctrl3 = ((BM3803_REG.uart_ctrl3 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \ ? (BM3803_REG.uart_ctrl3 = ((BM3803_REG.uart_ctrl3 & ~MSK_UART_PAR) | MSK_UART_ENABLE_PAR)) \
@@ -186,7 +186,7 @@
) \ ) \
) )
#define uart3_flow_ctrl_config(uart_flow) ( uart_flow == ON \ #define uart3_flow_ctrl_config(uart_flow) ( uart_flow == ON \
? (BM3803_REG.uart_ctrl3 |= MSK_UART_ENABLE_FLOW) \ ? (BM3803_REG.uart_ctrl3 |= MSK_UART_ENABLE_FLOW) \
: (BM3803_REG.uart_ctrl3 &= ~MSK_UART_ENABLE_FLOW) \ : (BM3803_REG.uart_ctrl3 &= ~MSK_UART_ENABLE_FLOW) \
) )
@@ -202,7 +202,7 @@
#define uart3_tx_ready() ((BM3803_REG.uart_status3 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY ) #define uart3_tx_ready() ((BM3803_REG.uart_status3 & MSK_UART_TXH_READY) == MSK_UART_TXH_READY )
#define uart3_rx_ready() ((BM3803_REG.uart_status3 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY) #define uart3_rx_ready() ((BM3803_REG.uart_status3 & MSK_UART_DATA_READY) == MSK_UART_DATA_READY)
#define uart3_send_byte(ch) (BM3803_REG.uart_data3 = ch) #define uart3_send_byte(ch) (BM3803_REG.uart_data3 = ch)
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
arch/sparc/src/s698pm/s698pm-uart.h
+2 -2
View File
@@ -84,7 +84,7 @@
#define TX 1 #define TX 1
#define RXTX 3 #define RXTX 3
/** Uart control list - Mask */ /* Uart control list - Mask */
#define MSK_UART_ENABLE_RX 0x01 #define MSK_UART_ENABLE_RX 0x01
#define MSK_UART_ENABLE_TX 0x02 #define MSK_UART_ENABLE_TX 0x02
@@ -162,7 +162,7 @@
#define uart_tx_ready() ((S698PM_REG.uart_status1 & UART_STA_TF) != UART_STA_TF) #define uart_tx_ready() ((S698PM_REG.uart_status1 & UART_STA_TF) != UART_STA_TF)
#define uart_rx_ready() ((S698PM_REG.uart_status1 & UART_STA_DR) == UART_STA_DR) #define uart_rx_ready() ((S698PM_REG.uart_status1 & UART_STA_DR) == UART_STA_DR)
#define uart_send_byte(ch) (S698PM_REG.uart_data1 = ch) #define uart_send_byte(ch) (S698PM_REG.uart_data1 = ch)
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
arch/xtensa/src/esp32/esp32_spi_slave.c
+2 -2
View File
@@ -755,7 +755,7 @@ static void esp32_spislv_rx(struct esp32_spislv_priv_s *priv)
if (recv_n < priv->rxlen) if (recv_n < priv->rxlen)
{ {
/** If upper layer does not receive all data of receive /* If upper layer does not receive all data of receive
* buffer, move the rest data to head of the buffer * buffer, move the rest data to head of the buffer
*/ */
@@ -831,7 +831,7 @@ static int esp32_spislv_interrupt(int irq, void *context, void *arg)
if (!priv->dma_chan) if (!priv->dma_chan)
{ {
/** With DMA, software should copy data from register /* With DMA, software should copy data from register
* to receive buffer * to receive buffer
*/ */
arch/xtensa/src/esp32s3/esp32s3_psram_octal.c
+20 -28
View File
@@ -242,7 +242,7 @@ static void get_psram_reg(int spi_num, struct opi_psram_reg *out_reg)
int dummy = OCT_PSRAM_RD_DUMMY_BITLEN; int dummy = OCT_PSRAM_RD_DUMMY_BITLEN;
int data_bit_len = 16; int data_bit_len = 16;
/** Read MR0~1 register */ /* Read MR0~1 register */
esp_rom_opiflash_exec_cmd(spi_num, mode, esp_rom_opiflash_exec_cmd(spi_num, mode,
OPI_PSRAM_REG_READ, OPI_PSRAM_REG_READ,
@@ -256,7 +256,7 @@ static void get_psram_reg(int spi_num, struct opi_psram_reg *out_reg)
BIT(1), BIT(1),
false); false);
/** Read MR2~3 register */ /* Read MR2~3 register */
esp_rom_opiflash_exec_cmd(spi_num, mode, esp_rom_opiflash_exec_cmd(spi_num, mode,
OPI_PSRAM_REG_READ, OPI_PSRAM_REG_READ,
@@ -270,7 +270,7 @@ static void get_psram_reg(int spi_num, struct opi_psram_reg *out_reg)
BIT(1), BIT(1),
false); false);
/** Read MR4 register */ /* Read MR4 register */
data_bit_len = 8; data_bit_len = 8;
esp_rom_opiflash_exec_cmd(spi_num, mode, esp_rom_opiflash_exec_cmd(spi_num, mode,
@@ -285,7 +285,7 @@ static void get_psram_reg(int spi_num, struct opi_psram_reg *out_reg)
BIT(1), BIT(1),
false); false);
/** Read MR8 register */ /* Read MR8 register */
esp_rom_opiflash_exec_cmd(spi_num, mode, esp_rom_opiflash_exec_cmd(spi_num, mode,
OPI_PSRAM_REG_READ, OPI_PSRAM_REG_READ,
@@ -365,8 +365,7 @@ static void print_psram_reg(const struct opi_psram_reg *psram_reg)
static void init_cs_timing(void) static void init_cs_timing(void)
{ {
/** /* SPI0/1 share the cs_hold / cs_setup, cd_hold_time / cd_setup_time,
* SPI0/1 share the cs_hold / cs_setup, cd_hold_time / cd_setup_time,
* cs_hold_delay registers for PSRAM, so we only need to set SPI0 * cs_hold_delay registers for PSRAM, so we only need to set SPI0
* related registers here. * related registers here.
*/ */
@@ -383,7 +382,7 @@ static void init_cs_timing(void)
OCT_PSRAM_CS_SETUP_TIME, OCT_PSRAM_CS_SETUP_TIME,
SPI_MEM_SPI_SMEM_CS_SETUP_TIME_S); SPI_MEM_SPI_SMEM_CS_SETUP_TIME_S);
/** CS1 high time */ /* CS1 high time */
SET_PERI_REG_BITS(SPI_MEM_SPI_SMEM_AC_REG(0), SET_PERI_REG_BITS(SPI_MEM_SPI_SMEM_AC_REG(0),
SPI_MEM_SPI_SMEM_CS_HOLD_DELAY_V, SPI_MEM_SPI_SMEM_CS_HOLD_DELAY_V,
@@ -432,7 +431,7 @@ static void init_psram_pins(void)
static void config_psram_spi_phases(void) static void config_psram_spi_phases(void)
{ {
/** Config Write CMD phase for SPI0 to access PSRAM */ /* Config Write CMD phase for SPI0 to access PSRAM */
SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0), SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0),
SPI_MEM_CACHE_SRAM_USR_WCMD_M); SPI_MEM_CACHE_SRAM_USR_WCMD_M);
@@ -445,7 +444,7 @@ static void config_psram_spi_phases(void)
OPI_PSRAM_SYNC_WRITE, OPI_PSRAM_SYNC_WRITE,
SPI_MEM_CACHE_SRAM_USR_WR_CMD_VALUE_S); SPI_MEM_CACHE_SRAM_USR_WR_CMD_VALUE_S);
/** Config Read CMD phase for SPI0 to access PSRAM */ /* Config Read CMD phase for SPI0 to access PSRAM */
SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0), SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0),
SPI_MEM_CACHE_SRAM_USR_RCMD_M); SPI_MEM_CACHE_SRAM_USR_RCMD_M);
@@ -458,7 +457,7 @@ static void config_psram_spi_phases(void)
OPI_PSRAM_SYNC_READ, OPI_PSRAM_SYNC_READ,
SPI_MEM_CACHE_SRAM_USR_RD_CMD_VALUE_S); SPI_MEM_CACHE_SRAM_USR_RD_CMD_VALUE_S);
/** Config ADDR phase */ /* Config ADDR phase */
SET_PERI_REG_BITS(SPI_MEM_CACHE_SCTRL_REG(0), SET_PERI_REG_BITS(SPI_MEM_CACHE_SCTRL_REG(0),
SPI_MEM_SRAM_ADDR_BITLEN_V, SPI_MEM_SRAM_ADDR_BITLEN_V,
@@ -467,7 +466,7 @@ static void config_psram_spi_phases(void)
SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0), SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0),
SPI_MEM_CACHE_USR_SCMD_4BYTE_M); SPI_MEM_CACHE_USR_SCMD_4BYTE_M);
/** Config RD/WR Dummy phase */ /* Config RD/WR Dummy phase */
SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0), SET_PERI_REG_MASK(SPI_MEM_CACHE_SCTRL_REG(0),
SPI_MEM_USR_RD_SRAM_DUMMY_M | SPI_MEM_USR_RD_SRAM_DUMMY_M |
@@ -518,12 +517,10 @@ static void config_psram_spi_phases(void)
static inline void spi_flash_set_rom_required_regs(void) static inline void spi_flash_set_rom_required_regs(void)
{ {
#ifdef CONFIG_ESP32S3_FLASH_MODE_OCT #ifdef CONFIG_ESP32S3_FLASH_MODE_OCT
/**
* Disable the variable dummy mode when doing timing tuning. /* Disable the variable dummy mode when doing timing tuning.
*
* STR /DTR mode setting is done every time when * STR /DTR mode setting is done every time when
* "esp_rom_opiflash_exec_cmd" is called. * "esp_rom_opiflash_exec_cmd" is called.
*
* Add any registers that are not set in ROM SPI flash functions here * Add any registers that are not set in ROM SPI flash functions here
* in the future. * in the future.
*/ */
@@ -549,8 +546,7 @@ static inline void spi_flash_set_rom_required_regs(void)
static inline void flash_set_vendor_required_regs(void) static inline void flash_set_vendor_required_regs(void)
{ {
#ifdef CONFIG_ESP32S3_FLASH_MODE_OCT #ifdef CONFIG_ESP32S3_FLASH_MODE_OCT
/** /* Set MSPI specifical configuration,
* Set MSPI specifical configuration,
* "esp32s3_bsp_opiflash_set_required_regs" is board defined function. * "esp32s3_bsp_opiflash_set_required_regs" is board defined function.
*/ */
@@ -561,7 +557,7 @@ static inline void flash_set_vendor_required_regs(void)
1, 1,
SPI_MEM_CACHE_USR_CMD_4BYTE_S); SPI_MEM_CACHE_USR_CMD_4BYTE_S);
#else #else
/** Restore MSPI registers after Octal PSRAM initialization. */ /* Restore MSPI registers after Octal PSRAM initialization. */
SET_PERI_REG_BITS(SPI_MEM_CACHE_FCTRL_REG(1), SET_PERI_REG_BITS(SPI_MEM_CACHE_FCTRL_REG(1),
SPI_MEM_CACHE_USR_CMD_4BYTE_V, SPI_MEM_CACHE_USR_CMD_4BYTE_V,
@@ -584,16 +580,16 @@ int IRAM_ATTR psram_enable(int mode, int vaddrmode)
init_psram_pins(); init_psram_pins();
init_cs_timing(); init_cs_timing();
/** enter MSPI slow mode to init PSRAM device registers */ /* enter MSPI slow mode to init PSRAM device registers */
esp32s3_spi_timing_set_mspi_low_speed(true); esp32s3_spi_timing_set_mspi_low_speed(true);
/** set to variable dummy mode */ /* set to variable dummy mode */
SET_PERI_REG_MASK(SPI_MEM_DDR_REG(1), SPI_MEM_SPI_FMEM_VAR_DUMMY); SET_PERI_REG_MASK(SPI_MEM_DDR_REG(1), SPI_MEM_SPI_FMEM_VAR_DUMMY);
esp_rom_spi_set_dtr_swap_mode(1, false, false); esp_rom_spi_set_dtr_swap_mode(1, false, false);
/** Set PSRAM read latency and drive strength */ /* Set PSRAM read latency and drive strength */
psram_reg.mr0.lt = 1; psram_reg.mr0.lt = 1;
psram_reg.mr0.read_latency = 2; psram_reg.mr0.read_latency = 2;
@@ -613,16 +609,13 @@ int IRAM_ATTR psram_enable(int mode, int vaddrmode)
esp32s3_spi_timing_set_mspi_high_speed(true); esp32s3_spi_timing_set_mspi_high_speed(true);
/** /* Tuning may change SPI1 regs, whereas legacy spi_flash APIs rely on
* Tuning may change SPI1 regs, whereas legacy spi_flash APIs rely on
* these regs. This function is to restore SPI1 init state. * these regs. This function is to restore SPI1 init state.
*/ */
spi_flash_set_rom_required_regs(); spi_flash_set_rom_required_regs();
/** /* Flash chip requires MSPI specifically, call this function to set them */
* Flash chip requires MSPI specifically, call this function to set them
*/
flash_set_vendor_required_regs(); flash_set_vendor_required_regs();
@@ -637,8 +630,7 @@ int psram_get_physical_size(uint32_t *out_size_bytes)
return g_psram_size > 0 ? OK : -EINVAL; return g_psram_size > 0 ? OK : -EINVAL;
} }
/* This function is to get the available physical psram size in bytes. /* This function is to get the available physical psram size in bytes. */
*/
int psram_get_available_size(uint32_t *out_size_bytes) int psram_get_available_size(uint32_t *out_size_bytes)
{ {
arch/xtensa/src/esp32s3/hardware/esp32s3_usb_serial_jtag.h
+38 -38
View File
@@ -31,10 +31,10 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/** Configuration Registers */ /* Configuration Registers */
/** USB_SERIAL_JTAG_EP1_REG register /* USB_SERIAL_JTAG_EP1_REG register
* USB_SERIAL_JTAG_EP1_REG. * USB_SERIAL_JTAG_EP1_REG.
*/ */
#define USB_SERIAL_JTAG_EP1_REG (DR_REG_USB_DEVICE_BASE + 0x0) #define USB_SERIAL_JTAG_EP1_REG (DR_REG_USB_DEVICE_BASE + 0x0)
@@ -55,7 +55,7 @@
#define USB_SERIAL_JTAG_RDWR_BYTE_V 0x000000ff #define USB_SERIAL_JTAG_RDWR_BYTE_V 0x000000ff
#define USB_SERIAL_JTAG_RDWR_BYTE_S 0 #define USB_SERIAL_JTAG_RDWR_BYTE_S 0
/** USB_SERIAL_JTAG_CONF0_REG register /* USB_SERIAL_JTAG_CONF0_REG register
* USB_SERIAL_JTAG_CONF0_REG. * USB_SERIAL_JTAG_CONF0_REG.
*/ */
@@ -191,8 +191,8 @@
#define USB_SERIAL_JTAG_USB_PAD_ENABLE_V 0x00000001 #define USB_SERIAL_JTAG_USB_PAD_ENABLE_V 0x00000001
#define USB_SERIAL_JTAG_USB_PAD_ENABLE_S 14 #define USB_SERIAL_JTAG_USB_PAD_ENABLE_S 14
/** USB_SERIAL_JTAG_TEST_REG register /* USB_SERIAL_JTAG_TEST_REG register
* USB_SERIAL_JTAG_TEST_REG. * USB_SERIAL_JTAG_TEST_REG.
*/ */
#define USB_SERIAL_JTAG_TEST_REG (DR_REG_USB_DEVICE_BASE + 0x1c) #define USB_SERIAL_JTAG_TEST_REG (DR_REG_USB_DEVICE_BASE + 0x1c)
@@ -237,8 +237,8 @@
#define USB_SERIAL_JTAG_TEST_TX_DM_V 0x00000001 #define USB_SERIAL_JTAG_TEST_TX_DM_V 0x00000001
#define USB_SERIAL_JTAG_TEST_TX_DM_S 3 #define USB_SERIAL_JTAG_TEST_TX_DM_S 3
/** USB_SERIAL_JTAG_MISC_CONF_REG register /* USB_SERIAL_JTAG_MISC_CONF_REG register
* USB_SERIAL_JTAG_MISC_CONF_REG. * USB_SERIAL_JTAG_MISC_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_MISC_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x44) #define USB_SERIAL_JTAG_MISC_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x44)
@@ -254,8 +254,8 @@
#define USB_SERIAL_JTAG_CLK_EN_V 0x00000001 #define USB_SERIAL_JTAG_CLK_EN_V 0x00000001
#define USB_SERIAL_JTAG_CLK_EN_S 0 #define USB_SERIAL_JTAG_CLK_EN_S 0
/** USB_SERIAL_JTAG_MEM_CONF_REG register /* USB_SERIAL_JTAG_MEM_CONF_REG register
* USB_SERIAL_JTAG_MEM_CONF_REG. * USB_SERIAL_JTAG_MEM_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_MEM_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x48) #define USB_SERIAL_JTAG_MEM_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x48)
@@ -280,10 +280,10 @@
#define USB_SERIAL_JTAG_USB_MEM_CLK_EN_V 0x00000001 #define USB_SERIAL_JTAG_USB_MEM_CLK_EN_V 0x00000001
#define USB_SERIAL_JTAG_USB_MEM_CLK_EN_S 1 #define USB_SERIAL_JTAG_USB_MEM_CLK_EN_S 1
/** Status Registers */ /* Status Registers */
/** USB_SERIAL_JTAG_EP1_CONF_REG register /* USB_SERIAL_JTAG_EP1_CONF_REG register
* USB_SERIAL_JTAG_EP1_CONF_REG. * USB_SERIAL_JTAG_EP1_CONF_REG.
*/ */
#define USB_SERIAL_JTAG_EP1_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x4) #define USB_SERIAL_JTAG_EP1_CONF_REG (DR_REG_USB_DEVICE_BASE + 0x4)
@@ -321,8 +321,8 @@
#define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_V 0x00000001 #define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_V 0x00000001
#define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_S 2 #define USB_SERIAL_JTAG_SERIAL_OUT_EP_DATA_AVAIL_S 2
/** USB_SERIAL_JTAG_JFIFO_ST_REG register /* USB_SERIAL_JTAG_JFIFO_ST_REG register
* USB_SERIAL_JTAG_JFIFO_ST_REG. * USB_SERIAL_JTAG_JFIFO_ST_REG.
*/ */
#define USB_SERIAL_JTAG_JFIFO_ST_REG (DR_REG_USB_DEVICE_BASE + 0x20) #define USB_SERIAL_JTAG_JFIFO_ST_REG (DR_REG_USB_DEVICE_BASE + 0x20)
@@ -406,8 +406,8 @@
#define USB_SERIAL_JTAG_OUT_FIFO_RESET_V 0x00000001 #define USB_SERIAL_JTAG_OUT_FIFO_RESET_V 0x00000001
#define USB_SERIAL_JTAG_OUT_FIFO_RESET_S 9 #define USB_SERIAL_JTAG_OUT_FIFO_RESET_S 9
/** USB_SERIAL_JTAG_FRAM_NUM_REG register /* USB_SERIAL_JTAG_FRAM_NUM_REG register
* USB_SERIAL_JTAG_FRAM_NUM_REG. * USB_SERIAL_JTAG_FRAM_NUM_REG.
*/ */
#define USB_SERIAL_JTAG_FRAM_NUM_REG (DR_REG_USB_DEVICE_BASE + 0x24) #define USB_SERIAL_JTAG_FRAM_NUM_REG (DR_REG_USB_DEVICE_BASE + 0x24)
@@ -422,8 +422,8 @@
#define USB_SERIAL_JTAG_SOF_FRAME_INDEX_V 0x000007ff #define USB_SERIAL_JTAG_SOF_FRAME_INDEX_V 0x000007ff
#define USB_SERIAL_JTAG_SOF_FRAME_INDEX_S 0 #define USB_SERIAL_JTAG_SOF_FRAME_INDEX_S 0
/** USB_SERIAL_JTAG_IN_EP0_ST_REG register /* USB_SERIAL_JTAG_IN_EP0_ST_REG register
* USB_SERIAL_JTAG_IN_EP0_ST_REG. * USB_SERIAL_JTAG_IN_EP0_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP0_ST_REG (DR_REG_USB_DEVICE_BASE + 0x28) #define USB_SERIAL_JTAG_IN_EP0_ST_REG (DR_REG_USB_DEVICE_BASE + 0x28)
@@ -455,8 +455,8 @@
#define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP0_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP1_ST_REG register /* USB_SERIAL_JTAG_IN_EP1_ST_REG register
* USB_SERIAL_JTAG_IN_EP1_ST_REG. * USB_SERIAL_JTAG_IN_EP1_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP1_ST_REG (DR_REG_USB_DEVICE_BASE + 0x2c) #define USB_SERIAL_JTAG_IN_EP1_ST_REG (DR_REG_USB_DEVICE_BASE + 0x2c)
@@ -489,8 +489,8 @@
#define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP1_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP2_ST_REG register /* USB_SERIAL_JTAG_IN_EP2_ST_REG register
* USB_SERIAL_JTAG_IN_EP2_ST_REG. * USB_SERIAL_JTAG_IN_EP2_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP2_ST_REG (DR_REG_USB_DEVICE_BASE + 0x30) #define USB_SERIAL_JTAG_IN_EP2_ST_REG (DR_REG_USB_DEVICE_BASE + 0x30)
@@ -525,8 +525,8 @@
#define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP2_RD_ADDR_S 9
/** USB_SERIAL_JTAG_IN_EP3_ST_REG register /* USB_SERIAL_JTAG_IN_EP3_ST_REG register
* USB_SERIAL_JTAG_IN_EP3_ST_REG. * USB_SERIAL_JTAG_IN_EP3_ST_REG.
*/ */
#define USB_SERIAL_JTAG_IN_EP3_ST_REG (DR_REG_USB_DEVICE_BASE + 0x34) #define USB_SERIAL_JTAG_IN_EP3_ST_REG (DR_REG_USB_DEVICE_BASE + 0x34)
@@ -561,8 +561,8 @@
#define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_S 9 #define USB_SERIAL_JTAG_IN_EP3_RD_ADDR_S 9
/** USB_SERIAL_JTAG_OUT_EP0_ST_REG register /* USB_SERIAL_JTAG_OUT_EP0_ST_REG register
* USB_SERIAL_JTAG_OUT_EP0_ST_REG. * USB_SERIAL_JTAG_OUT_EP0_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP0_ST_REG (DR_REG_USB_DEVICE_BASE + 0x38) #define USB_SERIAL_JTAG_OUT_EP0_ST_REG (DR_REG_USB_DEVICE_BASE + 0x38)
@@ -599,8 +599,8 @@
#define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_S 9 #define USB_SERIAL_JTAG_OUT_EP0_RD_ADDR_S 9
/** USB_SERIAL_JTAG_OUT_EP1_ST_REG register /* USB_SERIAL_JTAG_OUT_EP1_ST_REG register
* USB_SERIAL_JTAG_OUT_EP1_ST_REG. * USB_SERIAL_JTAG_OUT_EP1_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP1_ST_REG (DR_REG_USB_DEVICE_BASE + 0x3c) #define USB_SERIAL_JTAG_OUT_EP1_ST_REG (DR_REG_USB_DEVICE_BASE + 0x3c)
@@ -647,8 +647,8 @@
#define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_S 16 #define USB_SERIAL_JTAG_OUT_EP1_REC_DATA_CNT_S 16
/** USB_SERIAL_JTAG_OUT_EP2_ST_REG register /* USB_SERIAL_JTAG_OUT_EP2_ST_REG register
* USB_SERIAL_JTAG_OUT_EP2_ST_REG. * USB_SERIAL_JTAG_OUT_EP2_ST_REG.
*/ */
#define USB_SERIAL_JTAG_OUT_EP2_ST_REG (DR_REG_USB_DEVICE_BASE + 0x40) #define USB_SERIAL_JTAG_OUT_EP2_ST_REG (DR_REG_USB_DEVICE_BASE + 0x40)
@@ -685,10 +685,10 @@
#define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_V 0x0000007f #define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_V 0x0000007f
#define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_S 9 #define USB_SERIAL_JTAG_OUT_EP2_RD_ADDR_S 9
/** Interrupt Registers */ /* Interrupt Registers */
/** USB_SERIAL_JTAG_INT_RAW_REG register /* USB_SERIAL_JTAG_INT_RAW_REG register
* USB_SERIAL_JTAG_INT_RAW_REG. * USB_SERIAL_JTAG_INT_RAW_REG.
*/ */
#define USB_SERIAL_JTAG_INT_RAW_REG (DR_REG_USB_DEVICE_BASE + 0x8) #define USB_SERIAL_JTAG_INT_RAW_REG (DR_REG_USB_DEVICE_BASE + 0x8)
@@ -824,8 +824,8 @@
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_V 0x00000001 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_V 0x00000001
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_S 11 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_RAW_S 11
/** USB_SERIAL_JTAG_INT_ST_REG register /* USB_SERIAL_JTAG_INT_ST_REG register
* USB_SERIAL_JTAG_INT_ST_REG. * USB_SERIAL_JTAG_INT_ST_REG.
*/ */
#define USB_SERIAL_JTAG_INT_ST_REG (DR_REG_USB_DEVICE_BASE + 0xc) #define USB_SERIAL_JTAG_INT_ST_REG (DR_REG_USB_DEVICE_BASE + 0xc)
@@ -955,8 +955,8 @@
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_V 0x00000001 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_V 0x00000001
#define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_S 11 #define USB_SERIAL_JTAG_OUT_EP2_ZERO_PAYLOAD_INT_ST_S 11
/** USB_SERIAL_JTAG_INT_ENA_REG register /* USB_SERIAL_JTAG_INT_ENA_REG register
* USB_SERIAL_JTAG_INT_ENA_REG. * USB_SERIAL_JTAG_INT_ENA_REG.
*/ */
#define USB_SERIAL_JTAG_INT_ENA_REG (DR_REG_USB_DEVICE_BASE + 0x10) #define USB_SERIAL_JTAG_INT_ENA_REG (DR_REG_USB_DEVICE_BASE + 0x10)
boards/arm/stm32/nucleo-l152re/src/stm32_ili93418b.c
+6 -6
View File
@@ -233,7 +233,7 @@ static inline void write_byte(uint8_t data)
LCD_WR_SET; LCD_WR_SET;
} }
/** references https://controllerstech.com/interface-tft-display-with-stm32/ /* references https://controllerstech.com/interface-tft-display-with-stm32/
* #define READ() (((getreg32(STM32_GPIOA_IDR) & (1 << GPIO_PIN9)) >> 9) | \ * #define READ() (((getreg32(STM32_GPIOA_IDR) & (1 << GPIO_PIN9)) >> 9) | \
* ((getreg32(STM32_GPIOC_IDR) & (1 << GPIO_PIN7)) >> 6) | \ * ((getreg32(STM32_GPIOC_IDR) & (1 << GPIO_PIN7)) >> 6) | \
* ((getreg32(STM32_GPIOA_IDR) & (1 << GPIO_PIN10)) >> 8) | \ * ((getreg32(STM32_GPIOA_IDR) & (1 << GPIO_PIN10)) >> 8) | \
@@ -304,13 +304,13 @@ static inline uint8_t read_byte(void)
static int stm32_ili93418b_recvblock(struct ili9341_lcd_s *lcd, static int stm32_ili93418b_recvblock(struct ili9341_lcd_s *lcd,
uint16_t *wd, uint16_t nwords) uint16_t *wd, uint16_t nwords)
{ {
/** ili9341 uses a 18-bit pixel format packed in a 24-bit stream per pixel. /* ili9341 uses a 18-bit pixel format packed in a 24-bit stream per pixel.
* The following format is transmitted: RRRRRR00 GGGGGG00 BBBBBB00 * The following format is transmitted: RRRRRR00 GGGGGG00 BBBBBB00
* Convert it to: RRRRRGGG GGGBBBBB * Convert it to: RRRRRGGG GGGBBBBB
*/ */
/** 8-bit parallel mode is enabled for pixel data operations. /* 8-bit parallel mode is enabled for pixel data operations.
* Each pixel must be received by three read operations. * Each pixel must be received by three read operations.
*/ */
uint16_t *dest = (uint16_t *)wd; uint16_t *dest = (uint16_t *)wd;
drivers/audio/wm8994.c
+1 -1
View File
@@ -1458,7 +1458,7 @@ static int wm8994_enqueuebuffer(FAR struct audio_lowerhalf_s *dev,
return ret; return ret;
} }
/** Name: wm8994_cancelbuffer /* Name: wm8994_cancelbuffer
* *
* Description: Called when an enqueued buffer is being cancelled. * Description: Called when an enqueued buffer is being cancelled.
* *
drivers/audio/wm8994.h
+214 -428
View File
File diff suppressed because it is too large Load Diff
drivers/sensors/fxos8700cq.c
+2 -2
View File
@@ -64,7 +64,7 @@
/* Values */ /* Values */
#define FXOS8700CQ_WHOAMI_VAL 0xC7 #define FXOS8700CQ_WHOAMI_VAL 0xC7
/** status byte + x,y,z for accelerometer and magnetometer */ /* status byte + x,y,z for accelerometer and magnetometer */
#define FXOS8700CQ_READ_LEN ((8 + (16 * 3 + 16 * 3)) / 8) #define FXOS8700CQ_READ_LEN ((8 + (16 * 3 + 16 * 3)) / 8)
/**************************************************************************** /****************************************************************************
@@ -103,7 +103,7 @@ static int fxos8700cq_checkid(FAR struct fxos8700cq_dev_s *priv);
* Private Data * Private Data
****************************************************************************/ ****************************************************************************/
/** vtable that supports the character driver interface */ /* vtable that supports the character driver interface */
static const struct file_operations g_fxos8700cqfops = static const struct file_operations g_fxos8700cqfops =
{ {
drivers/wireless/ISM2_905MHzGFSK250kbps.c
+1 -1
View File
@@ -28,7 +28,7 @@
* Public Data * Public Data
****************************************************************************/ ****************************************************************************/
/** Settings for 905 MHz, GFSK at 250kbps /* Settings for 905 MHz, GFSK at 250kbps
* *
* ISM Region 2 (America) only, Band 902–928 MHz * ISM Region 2 (America) only, Band 902–928 MHz
* *
drivers/wireless/ieee80211/bcm43xxx/bcmf_ioctl.h
+3 -3
View File
@@ -267,7 +267,7 @@ typedef struct wl_join_scan_params
} }
end_packed_struct wl_join_scan_params_t; end_packed_struct wl_join_scan_params_t;
/** used for association with a specific BSSID and chanspec list */ /* used for association with a specific BSSID and chanspec list */
begin_packed_struct begin_packed_struct
typedef struct wl_assoc_params typedef struct wl_assoc_params
@@ -285,11 +285,11 @@ typedef struct wl_assoc_params
} }
end_packed_struct wl_assoc_params_t; end_packed_struct wl_assoc_params_t;
/** used for association to a specific BSSID and channel */ /* used for association to a specific BSSID and channel */
typedef wl_assoc_params_t wl_join_assoc_params_t; typedef wl_assoc_params_t wl_join_assoc_params_t;
/** extended join params */ /* extended join params */
begin_packed_struct begin_packed_struct
typedef struct wl_extjoin_params typedef struct wl_extjoin_params
include/nuttx/video/video_controls.h
+2 -2
View File
@@ -56,7 +56,7 @@
#define V4L2_CID_COLOR_KILLER (15) /* Color killer */ #define V4L2_CID_COLOR_KILLER (15) /* Color killer */
#define V4L2_CID_COLORFX (16) /* Color effect */ #define V4L2_CID_COLORFX (16) /* Color effect */
/** Enumeration for V4L2_CID_COLORFX */ /* Enumeration for V4L2_CID_COLORFX */
enum v4l2_colorfx enum v4l2_colorfx
{ {
@@ -87,7 +87,7 @@ enum v4l2_colorfx
/* Enumeration for V4L2_CID_EXPOSURE_AUTO */ /* Enumeration for V4L2_CID_EXPOSURE_AUTO */
enum v4l2_exposure_auto_type enum v4l2_exposure_auto_type
{ {
/* Exposure time:auto, iris aperture:auto */ /* Exposure time:auto, iris aperture:auto */