Bläddra i källkod

fix typo for non-blocking

lyon1998 1 år sedan
förälder
incheckning
c6d3e89bc1

+ 1 - 1
package/PikaStdDevice/pika_hal.c

@@ -388,7 +388,7 @@ int pika_hal_SG_ioctl_merge_config(pika_hal_SG_config* dst,
     _IOCTL_CONFIG_USE_DEFAULT(amplitude, 0.1);
     dst->offset = src->offset;
     dst->seconds = src->seconds;
-    _IOCTL_CONFIG_USE_DEFAULT(noblocking, PIKA_HAL_SG_NOBLOCKING_ENABLE);
+    _IOCTL_CONFIG_USE_DEFAULT(nonblocking, PIKA_HAL_SG_NONBLOCKING_ENABLE);
     _IOCTL_CONFIG_USE_DEFAULT(event_callback, NULL);
     _IOCTL_CONFIG_USE_DEFAULT(event_callback_filter,
                               PIKA_HAL_SG_EVENT_SIGNAL_ANY);

+ 5 - 5
package/PikaStdDevice/pika_hal.h

@@ -632,10 +632,10 @@ typedef enum {
 } PIKA_HAL_SG_EVENT_SIGNAL;
 
 typedef enum {
-    _PIKA_HAL_SG_NOBLOCKING_UNUSED = 0,
-    PIKA_HAL_SG_NOBLOCKING_ENABLE,
-    PIKA_HAL_SG_NOBLOCKING_DISABLE,
-} PIKA_HAL_SG_NOBLOCKING;
+    _PIKA_HAL_SG_NONBLOCKING_UNUSED = 0,
+    PIKA_HAL_SG_NONBLOCKING_ENABLE,
+    PIKA_HAL_SG_NONBLOCKING_DISABLE,
+} PIKA_HAL_SG_NONBLOCKING;
 
 typedef struct {
     PIKA_HAL_SG_WAVEFORM waveform;
@@ -643,7 +643,7 @@ typedef struct {
     pika_float amplitude;  // Amplitude in Volts
     pika_float offset;     // Offset in Volts
     pika_float seconds;    // Seconds to output
-    PIKA_HAL_SG_NOBLOCKING noblocking;
+    PIKA_HAL_SG_NONBLOCKING nonblocking;
     void (*event_callback)(pika_dev* dev, PIKA_HAL_SG_EVENT_SIGNAL signal);
     PIKA_HAL_SG_EVENT_SIGNAL event_callback_filter;
     PIKA_HAL_EVENT_CALLBACK_ENA event_callback_ena;

+ 3 - 3
package/PikaStdDevice/pika_hal_SOFT_SPI.c

@@ -63,7 +63,7 @@ int pika_hal_platform_SOFT_SPI_ioctl_enable(pika_dev* dev) {
     }
     pika_debug("SCK[0x%p] config", cfg->SCK);
     pika_hal_ioctl(cfg->SCK, PIKA_HAL_IOCTL_CONFIG, &cfg_SCK);
-    if (NULL != cfg->MOSI){
+    if (NULL != cfg->MOSI) {
         pika_debug("MOSI[0x%p] config", cfg->MOSI);
         pika_hal_ioctl(cfg->MOSI, PIKA_HAL_IOCTL_CONFIG, &cfg_MOSI);
     }
@@ -78,7 +78,7 @@ int pika_hal_platform_SOFT_SPI_ioctl_enable(pika_dev* dev) {
     }
     pika_debug("SCK[0x%p] enable", cfg->SCK);
     pika_hal_ioctl(cfg->SCK, PIKA_HAL_IOCTL_ENABLE);
-    if (NULL != cfg->MOSI){
+    if (NULL != cfg->MOSI) {
         pika_debug("MOSI[0x%p] enable", cfg->MOSI);
         pika_hal_ioctl(cfg->MOSI, PIKA_HAL_IOCTL_ENABLE);
     }
@@ -91,7 +91,7 @@ int pika_hal_platform_SOFT_SPI_ioctl_enable(pika_dev* dev) {
         _GPIO_write(cfg->CS, 1);
     }
     _GPIO_write(cfg->SCK, 1);
-    if (NULL != cfg->MOSI){
+    if (NULL != cfg->MOSI) {
         _GPIO_write(cfg->MOSI, 1);
     }
     return 0;

+ 1 - 1
port/linux/package/pikascript/pikascript-lib/PikaStdDevice/pika_hal.c

@@ -388,7 +388,7 @@ int pika_hal_SG_ioctl_merge_config(pika_hal_SG_config* dst,
     _IOCTL_CONFIG_USE_DEFAULT(amplitude, 0.1);
     dst->offset = src->offset;
     dst->seconds = src->seconds;
-    _IOCTL_CONFIG_USE_DEFAULT(noblocking, PIKA_HAL_SG_NOBLOCKING_ENABLE);
+    _IOCTL_CONFIG_USE_DEFAULT(nonblocking, PIKA_HAL_SG_NONBLOCKING_ENABLE);
     _IOCTL_CONFIG_USE_DEFAULT(event_callback, NULL);
     _IOCTL_CONFIG_USE_DEFAULT(event_callback_filter,
                               PIKA_HAL_SG_EVENT_SIGNAL_ANY);

+ 5 - 5
port/linux/package/pikascript/pikascript-lib/PikaStdDevice/pika_hal.h

@@ -632,10 +632,10 @@ typedef enum {
 } PIKA_HAL_SG_EVENT_SIGNAL;
 
 typedef enum {
-    _PIKA_HAL_SG_NOBLOCKING_UNUSED = 0,
-    PIKA_HAL_SG_NOBLOCKING_ENABLE,
-    PIKA_HAL_SG_NOBLOCKING_DISABLE,
-} PIKA_HAL_SG_NOBLOCKING;
+    _PIKA_HAL_SG_NONBLOCKING_UNUSED = 0,
+    PIKA_HAL_SG_NONBLOCKING_ENABLE,
+    PIKA_HAL_SG_NONBLOCKING_DISABLE,
+} PIKA_HAL_SG_NONBLOCKING;
 
 typedef struct {
     PIKA_HAL_SG_WAVEFORM waveform;
@@ -643,7 +643,7 @@ typedef struct {
     pika_float amplitude;  // Amplitude in Volts
     pika_float offset;     // Offset in Volts
     pika_float seconds;    // Seconds to output
-    PIKA_HAL_SG_NOBLOCKING noblocking;
+    PIKA_HAL_SG_NONBLOCKING nonblocking;
     void (*event_callback)(pika_dev* dev, PIKA_HAL_SG_EVENT_SIGNAL signal);
     PIKA_HAL_SG_EVENT_SIGNAL event_callback_filter;
     PIKA_HAL_EVENT_CALLBACK_ENA event_callback_ena;

+ 1 - 1
src/PikaPlatform.c

@@ -312,7 +312,7 @@ PIKA_WEAK char pika_platform_getchar(void) {
 }
 
 /* return -1 for no char received, 0 for received */
-PIKA_WEAK int pika_platform_getchar_noblock(char* ch) {
+PIKA_WEAK int pika_platform_getchar_nonblocking(char* ch) {
     WEAK_FUNCTION_NEED_OVERRIDE_ERROR_LOWLEVEL();
 }
 

+ 1 - 1
src/PikaPlatform.h

@@ -202,7 +202,7 @@ void pika_platform_wait(void);
 
 /* support shell */
 char pika_platform_getchar(void);
-int pika_platform_getchar_noblock(char* ch);
+int pika_platform_getchar_nonblocking(char* ch);
 int pika_platform_putchar(char ch);
 int pika_platform_fflush(void* stream);
 

+ 1 - 1
src/PikaVersion.h

@@ -2,4 +2,4 @@
 #define PIKA_VERSION_MINOR 13
 #define PIKA_VERSION_MICRO 3
 
-#define PIKA_EDIT_TIME "2024/08/04 00:40:33"
+#define PIKA_EDIT_TIME "2024/08/06 23:38:13"