core:siwigsm:Update SDK header files and lib package

Signed-off-by: Ajay Bhargav <[email protected]>

Author: ajaybhargav

cores/siwigsm/siwisdk/include/circbuf.h

@@ -54,10 +54,30 @@ int circbuf_pop_byte(int handle, unsigned char *data);
  * @param handle	[in] Handle to circular buffer
  * @param data		[out] pointer to read buffer
  * @param len		[in] Length of data to read
- * @return			On success, returns actual length read, -1 on error
+ * @return			On success, returns actual length read, negative value on error
  */
 int circbuf_pop(int handle, unsigned char *data, unsigned int len);
 
+/**
+ * Peek a byte from head of circular buffer. Subsequent calls
+ * to this function will lead to same byte unless @ref circbuf_pop or
+ * @ref circbuf_pop_byte is called.
+ * @param handle	[in] Handle to circular buffer
+ * @param data		[out] Pointer to read buffer
+ * @return			On success, returns actual length read, negative value on error
+ */
+int circbuf_peek_byte(int handle, unsigned char *data);
+
+/**
+ * Peek data from start of circular buffer. Data will not be removed
+ * from buffer unless @ref circbuf_pop or @ref circbuf_pop_byte is called.
+ * @param handle	[in] Handle to circular buffer
+ * @param data		[out] pointer to read buffer
+ * @param len		[in] Length of data to read
+ * @return			On success, returns actual length read, negative value on error
+ */
+int circbuf_peek(int handle, unsigned char *data, int len);
+
 /**
  * Check if buffer is empty
  * @param handle	[in] Handle to circular buffer

cores/siwigsm/siwisdk/include/hw/spi.h

@@ -7,64 +7,106 @@
 #define INCLUDE_HW_SPI_H_
 
 /**
- * Max supported Hardware SPI speed
+ * Max supported Hardware SPI speed (default 10MHz)
  */
-#define SPI_MAX_SPEED	10000000U
+#define SPI_MAX_SPEED	32000000U
+
+/**
+ * SPI Modes to configure clock polarity and clock phase.
+ *
+ * For more information see https://en.wikipedia.org/wiki/Serial_Peripheral_Interface#Clock_polarity_and_phase
+ */
+enum spi_mode_e {
+	SPI_MODE0,/**< Mode 0 (default): CPOL = 0, CPHA = 0 */
+	SPI_MODE1,/**< Mode 1: CPOL = 0, CPHA = 1 */
+	SPI_MODE2,/**< Mode 2: CPOL = 1, CPHA = 0 */
+	SPI_MODE3,/**< Mode 3: CPOL = 1, CPHA = 1 */
+};
+
+/**
+ * SPI byte order to configure shit in/out order of data byte.
+ */
+enum spi_byteorder_e {
+	SPI_BYTE_MSB_FIRST,/**< MSB sent first (default) */
+	SPI_BYTE_LSB_FIRST,/**< LSB sent first */
+};
+
+/**
+ * Chip select mode configures how chip select line is de-asserted during a
+ * transaction. It only used when hardware chip select is used during
+ * initialization. See @ref spi_hw_init
+ */
+enum spi_csmode_e {
+	SPI_CSMODE_TRANSACTION,/**< CS line de-asserted between each transaction.
+								This is default behavior of CS line. */
+	SPI_CSMODE_BYTE,       /**< CS line de-asserted after each byte in a
+								transaction */
+};
+
+/**
+ * Chip select polarity flags
+ */
+enum spi_cspol_e {
+	SPI_CSPOL_LOW, /**< Chip select is active low (default) */
+	SPI_CSPOL_HIGH,/**< Chip select is active high */
+};
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /**
  * Initialize SPI Hardware and setup pinmux
- * @param managed_cs	[in] Set it TRUE, if application software manages chip select status, FALSE otherwise
- * @param clock_hz		[in] SPI Clock speed
- * @param mode			[in] SPI Mode (0-3)
- * @return				0 on success, negative on error
+ * @param int hardware_cs	[in] Set it TRUE, if application hardware chip
+ * 								 select is used and hardware controls chip
+ * 								 select status, FALSE otherwise
+ * @return					0 on success, negative on error
  */
-int spi_hw_init(int managed_cs, unsigned int clock_hz, int mode);
+int spi_hw_init(int hardware_cs);
 
 /**
- * SPI Master harware read
- * @param buf			[out] Pointer to buffer where received data is stored
- * @param len			[in] Data to read
- * @return				Length of data read on success, negative on error
+ * Set/Change SPI clock speed. Default speed is @ref SPI_MAX_SPEED
+ * @param clock_hz			[in] Clock speed in Hz
+ * @return					0 on success, negative value on error
  */
-int spi_hw_read(unsigned char *buf, int len);
+int spi_hw_setclock(unsigned long clock_hz);
 
 /**
- * SPI Master write
- * @param buf			[in] Pointer to data buffer to write
- * @param len			[in] Length of data in buffer
- * @return				Length of data written on success, negative on error
+ * Configure SPI clock mode
+ * @param mode				[in] SPI mode, see @ref spi_mode_e
+ * @return					0 on success, negative value on error
  */
-int spi_hw_write(const unsigned char *buf, int len);
+int spi_hw_setmode(int mode);
 
 /**
- * SPI Master write then read
- * @param wrbuf			[in] Pointer to data buffer to write
- * @param wrlen			[in] Length of data to write
- * @param rdbuf			[out] Pointer to buffer to store data
- * @param rdlen			[in] Length of data to read
- * @return				Length of data read on success, negative on error
+ * Configure SPI byte shift order
+ * @param byte_order		[in] SPI byte order, see @ref spi_byteorder_e
+ * @return					0 on success, negative value on error
  */
-int spi_hw_writeread(const unsigned char *wrbuf, int wrlen, unsigned char *rdbuf, int rdlen);
+int spi_hw_setbyteorder(int byte_order);
 
 /**
- * Set/Change SPI clock speed
- * @param clock_hz		[in] Clock speed in Hz
+ * Configure chip-select line. Only needed when hardware_cs is used
+ * @param cs_mode			[in] Chip select mode, see @ref spi_csmode_e
+ * @param cs_pol			[in] Chip select polarity, see @ref spi_cspol_e
+ * @return					0 on success, negative value on error
  */
-void spi_hw_setclock(unsigned int clock_hz);
+int spi_hw_setcsmode(int cs_mode, int cs_pol);
 
 /**
- * Get currently set SPI clock speed
- * @return				Clock speed in Hz
+ * Perform SPI transaction
+ * @param wrbuf				[in] Pointer to data buffer to write, can be NULL
+ * 								 if only read operation to be performed
+ * @param rdbuf				[out] Pointer to buffer to store data, can be NULL
+ * 								  if only write operation to be performed
+ * @param length			[in] Length of data to read/write
+ * @return					Length of data read/write on success, negative on error
  */
-unsigned int spi_hw_getclock(void);
+int spi_hw_transfer(const unsigned char *wrbuf, unsigned char *rdbuf, int length);
 
 /**
  * Release SPI hardware
- * @return				0 on success, negative on error
+ * @return					0 on success, negative on error
  */
 int spi_hw_free(void);
 

cores/siwigsm/siwisdk/include/spifs.h

@@ -6,6 +6,8 @@
 #ifndef INC_SPIFS_H_
 #define INC_SPIFS_H_
 
+#include <hw/spi.h>
+
 /**
  * SPI Flash status
  */
@@ -15,14 +17,19 @@ enum sfstat_e {
 	SF_STAT_MOUNTED,   /**< SPI Flash enabled and filesystem is mounted successfully */
 };
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * Enable SPI Flash and mount LFS filesystem
- * @param gpio_cs	[in] GPIO number connected to SPI chip select
- * @param speed		[in] SPI Speed in KHz (max 10000 KHz)
- * @param mode		[in] SPI mode
- * @return			0 on success, negative value on failure
+ * @param gpio_cs		[in] GPIO number connected to SPI chip select
+ * @param speed_hz		[in] SPI Speed in Hz (max 10MHz)
+ * @param mode			[in] SPI mode
+ * @param byte_order	[in] SPI byte order, see
+ * @return				0 on success, negative value on failure
  */
-int spifs_enable(int gpio_cs, unsigned int speed, int mode);
+int spifs_enable(int gpio_cs, unsigned long speed_hz, int mode, int byte_order);
 
 /**
  * Disable SPI Flash and unmount LFS filesystem
@@ -36,4 +43,8 @@ int spifs_disable(void);
  */
 int spifs_getstatus(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* INC_SPIFS_H_ */

cores/siwigsm/siwisdk/include/sys/ioctl.h

@@ -34,6 +34,28 @@
  */
 #define FIOASYNC	0x5452
 
+/**
+ * Get Next character in read buffer
+ * without removing it. Multiple call to
+ * ioctl will result in same character unless
+ * read() is called
+ * expects int *
+ */
+#define TIOCPEEK	0x545C
+/**
+ * Get data from read buffer without removing it.
+ * expects struct @ref iopeek_t *
+ */
+#define TIOCPEEKBUF	0x545D
+
+/**
+ * Peek structure
+ */
+struct iopeek_t {
+	void *buf;	/** Buffer pointer to store read data */
+	int len;	/** Length of buffer, on return this is updated with actual bytes read */
+};
+
 #ifdef __cplusplus
 extern "C" {
 #endif