NotificationsYou must be signed in to change notification settings
Fork8.3k
Star20.6k

Commit290614c

committed

global: Remove the STATIC macro.

Damien has said for a while that he wants to get rid of it. No time likethe present!Methodology was:1)git ls-files | egrep '\.[ch]$' | \ xargs sed -Ei "s/(^| )STATIC($| )/\1static\2/"2)Do some manual cleanup in the diff by searching for the word STATIC incomments and changing those back.3)"git-grep STATIC docs/", manually fixed those cases4)"rg -t python STATIC", manually fixed the codegen lines that used STATIC.5)A few files in renesas-ra port flagged codespell so there are some spellingfixes on top of everything else.This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>

1 parent8fdcc25 commit290614cCopy full SHA for 290614c

File tree

481 files changed

+6290

-6296

lines changed

docs/develop
drivers
- bus
  - softqspi.c
- cyw43
  - cywbt.c
- dht
  - dht.c
- esp-hosted
  - esp_hosted_hal.c
- memory
  - spiflash.c
examples
- natmod
  - btree
    - btree_c.c
  - deflate
    - deflate.c
  - features0
    - features0.c
  - features1
    - features1.c
  - features2
    - main.c
  - features3
    - features3.c
  - features4
    - features4.c
  - framebuf
    - framebuf.c
  - re
    - re.c
- usercmodule
  - cexample
    - examplemodule.c
  - cppexample
    - examplemodule.c
  - subpackage
    - modexamplepackage.c
extmod
mpy-cross
- main.c
ports
- cc3200
  - boards
    - make-pins.py
  - ftp
    - ftp.c
  - misc
    - mpirq.c
  - mods
  - mptask.c
  - mpthreadport.c
  - util
    - random.c
- esp32
- esp8266
- mimxrt
- nrf
  - boards
    - MICROBIT/modules
    - make-pins.py
  - drivers
    - bluetooth
      - ble_uart.c
    - flash.c
  - modules
    - ble
      - modble.c
    - board
      - led.c
      - modboard.c
    - machine
    - music
      - modmusic.c
    - nrf
      - flashbdev.c
      - modnrf.c
    - os
      - microbitfs.c
      - modos.c
    - ubluepy
  - mphalport.c
  - pin_named_pins.c
- pic16bit
- qemu-arm
  - modmachine.c
- renesas-ra
- rp2
- samd
- stm32
  - accel.c
  - adc.c
  - boardctrl.c
  - boards
    - ADAFRUIT_F405_EXPRESS
      - bdev.c
    - ARDUINO_GIGA
      - bdev.c
    - ARDUINO_NICLA_VISION
      - bdev.c
    - ARDUINO_PORTENTA_H7
      - bdev.c
    - LEGO_HUB_NO6
      - bdev.c
      - cc2564.c
    - MIKROE_QUAIL
      - bdev.c
    - PYBD_SF2
      - bdev.c
    - SPARKFUN_MICROMOD_STM32
      - bdev.c
    - STM32F769DISC
      - board_init.c
    - STM32L476DISC
      - bdev.c
    - VCC_GND_F407VE
      - bdev.c
    - VCC_GND_F407ZG
      - bdev.c
  - can.c
  - dac.c
  - eth.c
  - extint.c
  - fdcan.c
  - i2c.c
  - irq.c
  - lcd.c
  - led.c
  - machine_adc.c
  - machine_i2c.c
  - machine_i2s.c
  - machine_spi.c
  - machine_uart.c
  - machine_wdt.c
  - main.c
  - make-stmconst.py
  - mboot
    - main.c
  - modmachine.c
  - modos.c
  - modpyb.c
  - modstm.c
  - modtime.c
  - mpbthciport.c
  - mpbtstackport.c
  - mpnetworkport.c
  - mpthreadport.c
  - network_lan.c
  - octospi.c
  - pin.c
  - powerctrl.c
  - pyb_can.c
  - pyb_i2c.c
  - pyb_spi.c
  - pybthread.c
  - qspi.c
  - rfcore.c
  - rng.c
  - rtc.c
  - sdcard.c
  - servo.c
  - spi.c
  - stm32_it.c
  - storage.c
  - subghz.c
  - timer.c
  - uart.c
  - usb.c
  - usbd_cdc_interface.c
  - usbd_desc.c
  - usbd_msc_interface.c
  - usrsw.c
- unix
- webassembly
  - main.c
- windows
  - fmode.c
  - windows_mphal.c
- zephyr
py
shared
- libc
  - printf.c
- readline
  - readline.c
- runtime
- timeutils
  - timeutils.c
- tinyusb
  - mp_cdc_common.c
tools
- boardgen.py

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

481 files changed

+6290

-6296

lines changed

`‎docs/develop/compiler.rst`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
@@ -98,7 +98,7 @@ Then also edit ``py/lexer.c`` to add the new keyword literal text:
`98`	`98`	`..code-block::c`
`99`	`99`	`:emphasize-lines: 12`
`100`	`100`
`101`		`-STATIC const char *const tok_kw[] = {`
	`101`	`+static const char *const tok_kw[] = {`
`102`	`102`	`...`
`103`	`103`	`"or",`
`104`	`104`	`"pass",`
`@@ -301,7 +301,7 @@ code statement:`
`301`	`301`
`302`	`302`	`..code-block::c`
`303`	`303`
`304`		`-STATIC void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {`
	`304`	`+static void emit_native_unary_op(emit_t *emit, mp_unary_op_t op) {`
`305`	`305`	`vtype_kind_t vtype;`
`306`	`306`	`emit_pre_pop_reg(emit, &vtype, REG_ARG_2);`
`307`	`307`	`if (vtype == VTYPE_PYOBJ) {`

`‎docs/develop/library.rst`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -48,16 +48,16 @@ hypothetical new module ``subsystem`` in the file ``modsubsystem.c``:
`48`	`48`	`#if MICROPY_PY_SUBSYSTEM`
`49`	`49`
`50`	`50`	`// info()`
`51`		`-STATIC mp_obj_t py_subsystem_info(void) {`
	`51`	`+static mp_obj_t py_subsystem_info(void) {`
`52`	`52`	`return MP_OBJ_NEW_SMALL_INT(42);`
`53`	`53`	`}`
`54`	`54`	`MP_DEFINE_CONST_FUN_OBJ_0(subsystem_info_obj, py_subsystem_info);`
`55`	`55`
`56`		`-STATIC const mp_rom_map_elem_t mp_module_subsystem_globals_table[] = {`
	`56`	`+static const mp_rom_map_elem_t mp_module_subsystem_globals_table[] = {`
`57`	`57`	`{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_subsystem) },`
`58`	`58`	`{ MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&subsystem_info_obj) },`
`59`	`59`	`};`
`60`		`-STATIC MP_DEFINE_CONST_DICT(mp_module_subsystem_globals, mp_module_subsystem_globals_table);`
	`60`	`+static MP_DEFINE_CONST_DICT(mp_module_subsystem_globals, mp_module_subsystem_globals_table);`
`61`	`61`
`62`	`62`	`const mp_obj_module_t mp_module_subsystem = {`
`63`	`63`	`.base = { &mp_type_module },`

`‎docs/develop/natmod.rst`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -128,15 +128,15 @@ The file ``factorial.c`` contains:
`128`	`128`	`#include "py/dynruntime.h"`
`129`	`129`
`130`	`130`	`// Helper function to compute factorial`
`131`		`-STATIC mp_int_t factorial_helper(mp_int_t x) {`
	`131`	`+static mp_int_t factorial_helper(mp_int_t x) {`
`132`	`132`	`if (x == 0) {`
`133`	`133`	`return 1;`
`134`	`134`	`}`
`135`	`135`	`return x * factorial_helper(x - 1);`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`// This is the function which will be called from Python, as factorial(x)`
`139`		`-STATIC mp_obj_t factorial(mp_obj_t x_obj) {`
	`139`	`+static mp_obj_t factorial(mp_obj_t x_obj) {`
`140`	`140`	`// Extract the integer from the MicroPython input object`
`141`	`141`	`mp_int_t x = mp_obj_get_int(x_obj);`
`142`	`142`	`// Calculate the factorial`
@@ -145,7 +145,7 @@ The file ``factorial.c`` contains:
`145`	`145`	`return mp_obj_new_int(result);`
`146`	`146`	`}`
`147`	`147`	`// Define a Python reference to the function above`
`148`		`-STATIC MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);`
	`148`	`+static MP_DEFINE_CONST_FUN_OBJ_1(factorial_obj, factorial);`
`149`	`149`
`150`	`150`	`// This is the entry point and is called when the module is imported`
`151`	`151`	`mp_obj_t mpy_init(mp_obj_fun_bc_t self, size_t n_args, size_t n_kw, mp_obj_t args) {`

`‎docs/develop/porting.rst`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -262,17 +262,17 @@ To add a custom module like ``myport``, first add the module definition in a fil
`262`	`262`
`263`	`263`	`#include "py/runtime.h"`
`264`	`264`
`265`		`-STATIC mp_obj_t myport_info(void) {`
	`265`	`+static mp_obj_t myport_info(void) {`
`266`	`266`	`mp_printf(&mp_plat_print, "info about my port\n");`
`267`	`267`	`return mp_const_none;`
`268`	`268`	`}`
`269`		`-STATIC MP_DEFINE_CONST_FUN_OBJ_0(myport_info_obj, myport_info);`
	`269`	`+static MP_DEFINE_CONST_FUN_OBJ_0(myport_info_obj, myport_info);`
`270`	`270`
`271`		`-STATIC const mp_rom_map_elem_t myport_module_globals_table[] = {`
	`271`	`+static const mp_rom_map_elem_t myport_module_globals_table[] = {`
`272`	`272`	`{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_myport) },`
`273`	`273`	`{ MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&myport_info_obj) },`
`274`	`274`	`};`
`275`		`-STATIC MP_DEFINE_CONST_DICT(myport_module_globals, myport_module_globals_table);`
	`275`	`+static MP_DEFINE_CONST_DICT(myport_module_globals, myport_module_globals_table);`
`276`	`276`
`277`	`277`	`const mp_obj_module_t myport_module = {`
`278`	`278`	`.base = { &mp_type_module },`

`‎drivers/bus/softqspi.c`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -49,14 +49,14 @@`
`49`	`49`
`50`	`50`	`#endif`
`51`	`51`
`52`		`-STATICvoidnibble_write(mp_soft_qspi_obj_t*self,uint8_tv) {`
	`52`	`+staticvoidnibble_write(mp_soft_qspi_obj_t*self,uint8_tv) {`
`53`	`53`	`mp_hal_pin_write(self->io0,v&1);`
`54`	`54`	`mp_hal_pin_write(self->io1, (v >>1)&1);`
`55`	`55`	`mp_hal_pin_write(self->io2, (v >>2)&1);`
`56`	`56`	`mp_hal_pin_write(self->io3, (v >>3)&1);`
`57`	`57`	`}`
`58`	`58`
`59`		`-STATICintmp_soft_qspi_ioctl(void*self_in,uint32_tcmd) {`
	`59`	`+staticintmp_soft_qspi_ioctl(void*self_in,uint32_tcmd) {`
`60`	`60`	`mp_soft_qspi_obj_tself= (mp_soft_qspi_obj_t)self_in;`
`61`	`61`
`62`	`62`	`switch (cmd) {`
`@@ -80,7 +80,7 @@ STATIC int mp_soft_qspi_ioctl(void *self_in, uint32_t cmd) {`
`80`	`80`	`return0;// success`
`81`	`81`	`}`
`82`	`82`
`83`		`-STATICvoidmp_soft_qspi_transfer(mp_soft_qspi_obj_tself,size_tlen,constuint8_tsrc,uint8_t*dest) {`
	`83`	`+staticvoidmp_soft_qspi_transfer(mp_soft_qspi_obj_tself,size_tlen,constuint8_tsrc,uint8_t*dest) {`
`84`	`84`	`// Will run as fast as possible, limited only by CPU speed and GPIO time`
`85`	`85`	`mp_hal_pin_input(self->io1);`
`86`	`86`	`mp_hal_pin_output(self->io0);`
`@@ -119,7 +119,7 @@ STATIC void mp_soft_qspi_transfer(mp_soft_qspi_obj_t *self, size_t len, const ui`
`119`	`119`	`}`
`120`	`120`	`}`
`121`	`121`
`122`		`-STATICvoidmp_soft_qspi_qread(mp_soft_qspi_obj_tself,size_tlen,uint8_tbuf) {`
	`122`	`+staticvoidmp_soft_qspi_qread(mp_soft_qspi_obj_tself,size_tlen,uint8_tbuf) {`
`123`	`123`	`// Make all IO lines input`
`124`	`124`	`mp_hal_pin_input(self->io2);`
`125`	`125`	`mp_hal_pin_input(self->io3);`
`@@ -137,7 +137,7 @@ STATIC void mp_soft_qspi_qread(mp_soft_qspi_obj_t self, size_t len, uint8_t bu`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-STATICvoidmp_soft_qspi_qwrite(mp_soft_qspi_obj_tself,size_tlen,constuint8_tbuf) {`
	`140`	`+staticvoidmp_soft_qspi_qwrite(mp_soft_qspi_obj_tself,size_tlen,constuint8_tbuf) {`
`141`	`141`	`// Make all IO lines output`
`142`	`142`	`mp_hal_pin_output(self->io2);`
`143`	`143`	`mp_hal_pin_output(self->io3);`
`@@ -158,7 +158,7 @@ STATIC void mp_soft_qspi_qwrite(mp_soft_qspi_obj_t *self, size_t len, const uint`
`158`	`158`	`//mp_hal_pin_input(self->io1);`
`159`	`159`	`}`
`160`	`160`
`161`		`-STATICintmp_soft_qspi_write_cmd_data(void*self_in,uint8_tcmd,size_tlen,uint32_tdata) {`
	`161`	`+staticintmp_soft_qspi_write_cmd_data(void*self_in,uint8_tcmd,size_tlen,uint32_tdata) {`
`162`	`162`	`mp_soft_qspi_obj_tself= (mp_soft_qspi_obj_t)self_in;`
`163`	`163`	`uint32_tcmd_buf=cmd \|data <<8;`
`164`	`164`	`CS_LOW(self);`
`@@ -167,7 +167,7 @@ STATIC int mp_soft_qspi_write_cmd_data(void *self_in, uint8_t cmd, size_t len, u`
`167`	`167`	`return0;`
`168`	`168`	`}`
`169`	`169`
`170`		`-STATICintmp_soft_qspi_write_cmd_addr_data(voidself_in,uint8_tcmd,uint32_taddr,size_tlen,constuint8_tsrc) {`
	`170`	`+staticintmp_soft_qspi_write_cmd_addr_data(voidself_in,uint8_tcmd,uint32_taddr,size_tlen,constuint8_tsrc) {`
`171`	`171`	`mp_soft_qspi_obj_tself= (mp_soft_qspi_obj_t)self_in;`
`172`	`172`	`uint8_tcmd_buf[5]= {cmd};`
`173`	`173`	`uint8_taddr_len=mp_spi_set_addr_buff(&cmd_buf[1],addr);`
`@@ -178,7 +178,7 @@ STATIC int mp_soft_qspi_write_cmd_addr_data(void *self_in, uint8_t cmd, uint32_t`
`178`	`178`	`return0;`
`179`	`179`	`}`
`180`	`180`
`181`		`-STATICintmp_soft_qspi_read_cmd(voidself_in,uint8_tcmd,size_tlen,uint32_tdest) {`
	`181`	`+staticintmp_soft_qspi_read_cmd(voidself_in,uint8_tcmd,size_tlen,uint32_tdest) {`
`182`	`182`	`mp_soft_qspi_obj_tself= (mp_soft_qspi_obj_t)self_in;`
`183`	`183`	`uint32_tcmd_buf=cmd;`
`184`	`184`	`CS_LOW(self);`
`@@ -188,7 +188,7 @@ STATIC int mp_soft_qspi_read_cmd(void *self_in, uint8_t cmd, size_t len, uint32_`
`188`	`188`	`return0;`
`189`	`189`	`}`
`190`	`190`
`191`		`-STATICintmp_soft_qspi_read_cmd_qaddr_qdata(voidself_in,uint8_tcmd,uint32_taddr,size_tlen,uint8_tdest) {`
	`191`	`+staticintmp_soft_qspi_read_cmd_qaddr_qdata(voidself_in,uint8_tcmd,uint32_taddr,size_tlen,uint8_tdest) {`
`192`	`192`	`mp_soft_qspi_obj_tself= (mp_soft_qspi_obj_t)self_in;`
`193`	`193`	`uint8_tcmd_buf[7]= {cmd};`
`194`	`194`	`uint8_taddr_len=mp_spi_set_addr_buff(&cmd_buf[1],addr);`

`‎drivers/cyw43/cywbt.c`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ extern uint8_t mp_bluetooth_hci_cmd_buf[4 + 256];`
`51`	`51`	`// Provided by the port.`
`52`	`52`	`externmachine_uart_obj_tmp_bluetooth_hci_uart_obj;`
`53`	`53`
`54`		`-STATICvoidcywbt_wait_cts_low(void) {`
	`54`	`+staticvoidcywbt_wait_cts_low(void) {`
`55`	`55`	`mp_hal_pin_config(CYW43_PIN_BT_CTS,MP_HAL_PIN_MODE_INPUT,MP_HAL_PIN_PULL_UP,0);`
`56`	`56`	`for (inti=0;i<200;++i) {`
`57`	`57`	`if (mp_hal_pin_read(CYW43_PIN_BT_CTS)==0) {`
`@@ -64,7 +64,7 @@ STATIC void cywbt_wait_cts_low(void) {`
`64`	`64`	`}`
`65`	`65`	`#endif`
`66`	`66`
`67`		`-STATICintcywbt_hci_cmd_raw(size_tlen,uint8_t*buf) {`
	`67`	`+staticintcywbt_hci_cmd_raw(size_tlen,uint8_t*buf) {`
`68`	`68`	`mp_bluetooth_hci_uart_write((void*)buf,len);`
`69`	`69`	`for (intc,i=0;i<6;++i) {`
`70`	`70`	`while ((c=mp_bluetooth_hci_uart_readchar())==-1) {`
`@@ -96,7 +96,7 @@ STATIC int cywbt_hci_cmd_raw(size_t len, uint8_t *buf) {`
`96`	`96`	`return0;`
`97`	`97`	`}`
`98`	`98`
`99`		`-STATICintcywbt_hci_cmd(intogf,intocf,size_tparam_len,constuint8_t*param_buf) {`
	`99`	`+staticintcywbt_hci_cmd(intogf,intocf,size_tparam_len,constuint8_t*param_buf) {`
`100`	`100`	`uint8_t*buf=mp_bluetooth_hci_cmd_buf;`
`101`	`101`	`buf[0]=0x01;`
`102`	`102`	`buf[1]=ocf;`
`@@ -108,27 +108,27 @@ STATIC int cywbt_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *para`
`108`	`108`	`returncywbt_hci_cmd_raw(4+param_len,buf);`
`109`	`109`	`}`
`110`	`110`
`111`		`-STATICvoidput_le16(uint8_t*buf,uint16_tval) {`
	`111`	`+staticvoidput_le16(uint8_t*buf,uint16_tval) {`
`112`	`112`	`buf[0]=val;`
`113`	`113`	`buf[1]=val >>8;`
`114`	`114`	`}`
`115`	`115`
`116`		`-STATICvoidput_le32(uint8_t*buf,uint32_tval) {`
	`116`	`+staticvoidput_le32(uint8_t*buf,uint32_tval) {`
`117`	`117`	`buf[0]=val;`
`118`	`118`	`buf[1]=val >>8;`
`119`	`119`	`buf[2]=val >>16;`
`120`	`120`	`buf[3]=val >>24;`
`121`	`121`	`}`
`122`	`122`
`123`		`-STATICintcywbt_set_baudrate(uint32_tbaudrate) {`
	`123`	`+staticintcywbt_set_baudrate(uint32_tbaudrate) {`
`124`	`124`	`uint8_tbuf[6];`
`125`	`125`	`put_le16(buf,0);`
`126`	`126`	`put_le32(buf+2,baudrate);`
`127`	`127`	`returncywbt_hci_cmd(0x3f,0x18,6,buf);`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`// download firmware`
`131`		`-STATICintcywbt_download_firmware(constuint8_t*firmware) {`
	`131`	`+staticintcywbt_download_firmware(constuint8_t*firmware) {`
`132`	`132`	`cywbt_hci_cmd(0x3f,0x2e,0,NULL);`
`133`	`133`
`134`	`134`	`boollast_packet= false;`
`@@ -255,7 +255,7 @@ int mp_bluetooth_hci_controller_deinit(void) {`
`255`	`255`	`}`
`256`	`256`
`257`	`257`	`#ifdefCYW43_PIN_BT_DEV_WAKE`
`258`		`-STATICuint32_tbt_sleep_ticks;`
	`258`	`+staticuint32_tbt_sleep_ticks;`
`259`	`259`	`#endif`
`260`	`260`
`261`	`261`	`intmp_bluetooth_hci_controller_sleep_maybe(void) {`

`‎drivers/dht/dht.c`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`#definemp_hal_pin_od_high_dht mp_hal_pin_od_high`
`41`	`41`	`#endif`
`42`	`42`
`43`		`-STATICmp_obj_tdht_readinto(mp_obj_tpin_in,mp_obj_tbuf_in) {`
	`43`	`+staticmp_obj_tdht_readinto(mp_obj_tpin_in,mp_obj_tbuf_in) {`
`44`	`44`	`mp_hal_pin_obj_tpin=mp_hal_get_pin_obj(pin_in);`
`45`	`45`	`mp_hal_pin_open_drain(pin);`
`46`	`46`

`‎drivers/esp-hosted/esp_hosted_hal.c`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,14 @@`
`44`	`44`
`45`	`45`	`externvoidmod_network_poll_events(void);`
`46`	`46`
`47`		`-STATICmp_obj_tesp_hosted_pin_irq_callback(mp_obj_tself_in) {`
	`47`	`+staticmp_obj_tesp_hosted_pin_irq_callback(mp_obj_tself_in) {`
`48`	`48`	`#ifdefMICROPY_HW_WIFI_LED`
`49`	`49`	`led_toggle(MICROPY_HW_WIFI_LED);`
`50`	`50`	`#endif`
`51`	`51`	`mod_network_poll_events();`
`52`	`52`	`returnmp_const_none;`
`53`	`53`	`}`
`54`		`-STATICMP_DEFINE_CONST_FUN_OBJ_1(esp_hosted_pin_irq_callback_obj,esp_hosted_pin_irq_callback);`
	`54`	`+staticMP_DEFINE_CONST_FUN_OBJ_1(esp_hosted_pin_irq_callback_obj,esp_hosted_pin_irq_callback);`
`55`	`55`
`56`	`56`	`MP_WEAKintesp_hosted_hal_init(uint32_tmode) {`
`57`	`57`	`// Perform a hard reset and set pins to their defaults.`

`‎drivers/memory/spiflash.c`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,21 +56,21 @@`
`56`	`56`	`#definePAGE_SIZE (256) // maximum bytes we can write in one SPI transfer`
`57`	`57`	`#defineSECTOR_SIZE MP_SPIFLASH_ERASE_BLOCK_SIZE`
`58`	`58`
`59`		`-STATICvoidmp_spiflash_acquire_bus(mp_spiflash_t*self) {`
	`59`	`+staticvoidmp_spiflash_acquire_bus(mp_spiflash_t*self) {`
`60`	`60`	`constmp_spiflash_config_t*c=self->config;`
`61`	`61`	`if (c->bus_kind==MP_SPIFLASH_BUS_QSPI) {`
`62`	`62`	`c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data,MP_QSPI_IOCTL_BUS_ACQUIRE);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-STATICvoidmp_spiflash_release_bus(mp_spiflash_t*self) {`
	`66`	`+staticvoidmp_spiflash_release_bus(mp_spiflash_t*self) {`
`67`	`67`	`constmp_spiflash_config_t*c=self->config;`
`68`	`68`	`if (c->bus_kind==MP_SPIFLASH_BUS_QSPI) {`
`69`	`69`	`c->bus.u_qspi.proto->ioctl(c->bus.u_qspi.data,MP_QSPI_IOCTL_BUS_RELEASE);`
`70`	`70`	`}`
`71`	`71`	`}`
`72`	`72`
`73`		`-STATICintmp_spiflash_write_cmd_data(mp_spiflash_t*self,uint8_tcmd,size_tlen,uint32_tdata) {`
	`73`	`+staticintmp_spiflash_write_cmd_data(mp_spiflash_t*self,uint8_tcmd,size_tlen,uint32_tdata) {`
`74`	`74`	`intret=0;`
`75`	`75`	`constmp_spiflash_config_t*c=self->config;`
`76`	`76`	`if (c->bus_kind==MP_SPIFLASH_BUS_SPI) {`
`@@ -84,7 +84,7 @@ STATIC int mp_spiflash_write_cmd_data(mp_spiflash_t *self, uint8_t cmd, size_t l`
`84`	`84`	`returnret;`
`85`	`85`	`}`
`86`	`86`
`87`		`-STATICintmp_spiflash_transfer_cmd_addr_data(mp_spiflash_tself,uint8_tcmd,uint32_taddr,size_tlen,constuint8_tsrc,uint8_t*dest) {`
	`87`	`+staticintmp_spiflash_transfer_cmd_addr_data(mp_spiflash_tself,uint8_tcmd,uint32_taddr,size_tlen,constuint8_tsrc,uint8_t*dest) {`
`88`	`88`	`intret=0;`
`89`	`89`	`constmp_spiflash_config_t*c=self->config;`
`90`	`90`	`if (c->bus_kind==MP_SPIFLASH_BUS_SPI) {`
`@@ -109,7 +109,7 @@ STATIC int mp_spiflash_transfer_cmd_addr_data(mp_spiflash_t *self, uint8_t cmd,`
`109`	`109`	`returnret;`
`110`	`110`	`}`
`111`	`111`
`112`		`-STATICintmp_spiflash_read_cmd(mp_spiflash_tself,uint8_tcmd,size_tlen,uint32_tdest) {`
	`112`	`+staticintmp_spiflash_read_cmd(mp_spiflash_tself,uint8_tcmd,size_tlen,uint32_tdest) {`
`113`	`113`	`constmp_spiflash_config_t*c=self->config;`
`114`	`114`	`if (c->bus_kind==MP_SPIFLASH_BUS_SPI) {`
`115`	`115`	`mp_hal_pin_write(c->bus.u_spi.cs,0);`
`@@ -122,7 +122,7 @@ STATIC int mp_spiflash_read_cmd(mp_spiflash_t *self, uint8_t cmd, size_t len, ui`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`
`125`		`-STATICintmp_spiflash_read_data(mp_spiflash_tself,uint32_taddr,size_tlen,uint8_tdest) {`
	`125`	`+staticintmp_spiflash_read_data(mp_spiflash_tself,uint32_taddr,size_tlen,uint8_tdest) {`
`126`	`126`	`constmp_spiflash_config_t*c=self->config;`
`127`	`127`	`uint8_tcmd;`
`128`	`128`	`if (c->bus_kind==MP_SPIFLASH_BUS_SPI) {`
`@@ -133,11 +133,11 @@ STATIC int mp_spiflash_read_data(mp_spiflash_t *self, uint32_t addr, size_t len,`
`133`	`133`	`returnmp_spiflash_transfer_cmd_addr_data(self,cmd,addr,len,NULL,dest);`
`134`	`134`	`}`
`135`	`135`
`136`		`-STATICintmp_spiflash_write_cmd(mp_spiflash_t*self,uint8_tcmd) {`
	`136`	`+staticintmp_spiflash_write_cmd(mp_spiflash_t*self,uint8_tcmd) {`
`137`	`137`	`returnmp_spiflash_write_cmd_data(self,cmd,0,0);`
`138`	`138`	`}`
`139`	`139`
`140`		`-STATICintmp_spiflash_wait_sr(mp_spiflash_t*self,uint8_tmask,uint8_tval,uint32_ttimeout) {`
	`140`	`+staticintmp_spiflash_wait_sr(mp_spiflash_t*self,uint8_tmask,uint8_tval,uint32_ttimeout) {`
`141`	`141`	`do {`
`142`	`142`	`uint32_tsr;`
`143`	`143`	`intret=mp_spiflash_read_cmd(self,CMD_RDSR,1,&sr);`
`@@ -152,11 +152,11 @@ STATIC int mp_spiflash_wait_sr(mp_spiflash_t *self, uint8_t mask, uint8_t val, u`
`152`	`152`	`return-MP_ETIMEDOUT;`
`153`	`153`	`}`
`154`	`154`
`155`		`-STATICintmp_spiflash_wait_wel1(mp_spiflash_t*self) {`
	`155`	`+staticintmp_spiflash_wait_wel1(mp_spiflash_t*self) {`
`156`	`156`	`returnmp_spiflash_wait_sr(self,2,2,WAIT_SR_TIMEOUT);`
`157`	`157`	`}`
`158`	`158`
`159`		`-STATICintmp_spiflash_wait_wip0(mp_spiflash_t*self) {`
	`159`	`+staticintmp_spiflash_wait_wip0(mp_spiflash_t*self) {`
`160`	`160`	`returnmp_spiflash_wait_sr(self,1,0,WAIT_SR_TIMEOUT);`
`161`	`161`	`}`
`162`	`162`
`@@ -219,7 +219,7 @@ void mp_spiflash_deepsleep(mp_spiflash_t *self, int value) {`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`
`222`		`-STATICintmp_spiflash_erase_block_internal(mp_spiflash_t*self,uint32_taddr) {`
	`222`	`+staticintmp_spiflash_erase_block_internal(mp_spiflash_t*self,uint32_taddr) {`
`223`	`223`	`intret=0;`
`224`	`224`	`// enable writes`
`225`	`225`	`ret=mp_spiflash_write_cmd(self,CMD_WREN);`
`@@ -244,7 +244,7 @@ STATIC int mp_spiflash_erase_block_internal(mp_spiflash_t *self, uint32_t addr)`
`244`	`244`	`returnmp_spiflash_wait_wip0(self);`
`245`	`245`	`}`
`246`	`246`
`247`		`-STATICintmp_spiflash_write_page(mp_spiflash_tself,uint32_taddr,size_tlen,constuint8_tsrc) {`
	`247`	`+staticintmp_spiflash_write_page(mp_spiflash_tself,uint32_taddr,size_tlen,constuint8_tsrc) {`
`248`	`248`	`intret=0;`
`249`	`249`	`// enable writes`
`250`	`250`	`ret=mp_spiflash_write_cmd(self,CMD_WREN);`
`@@ -361,7 +361,7 @@ int mp_spiflash_cached_read(mp_spiflash_t *self, uint32_t addr, size_t len, uint`
`361`	`361`	`returnret;`
`362`	`362`	`}`
`363`	`363`
`364`		`-STATICintmp_spiflash_cache_flush_internal(mp_spiflash_t*self) {`
	`364`	`+staticintmp_spiflash_cache_flush_internal(mp_spiflash_t*self) {`
`365`	`365`	`#ifUSE_WR_DELAY`
`366`	`366`	`if (!(self->flags&1)) {`
`367`	`367`	`return0;`
`@@ -396,7 +396,7 @@ int mp_spiflash_cache_flush(mp_spiflash_t *self) {`
`396`	`396`	`returnret;`
`397`	`397`	`}`
`398`	`398`
`399`		`-STATICintmp_spiflash_cached_write_part(mp_spiflash_tself,uint32_taddr,size_tlen,constuint8_tsrc) {`
	`399`	`+staticintmp_spiflash_cached_write_part(mp_spiflash_tself,uint32_taddr,size_tlen,constuint8_tsrc) {`
`400`	`400`	`// Align to 4096 sector`
`401`	`401`	`uint32_toffset=addr&0xfff;`
`402`	`402`	`uint32_tsec=addr >>12;`

`‎examples/natmod/btree/btree_c.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,9 @@ mp_getiter_iternext_custom_t btree_getiter_iternext;`
`100`	`100`	`#include"extmod/modbtree.c"`
`101`	`101`
`102`	`102`	`mp_map_elem_tbtree_locals_dict_table[8];`
`103`		`-STATICMP_DEFINE_CONST_DICT(btree_locals_dict,btree_locals_dict_table);`
	`103`	`+staticMP_DEFINE_CONST_DICT(btree_locals_dict,btree_locals_dict_table);`
`104`	`104`
`105`		`-STATICmp_obj_tbtree_open(size_tn_args,constmp_obj_t*args) {`
	`105`	`+staticmp_obj_tbtree_open(size_tn_args,constmp_obj_t*args) {`
`106`	`106`	`// Make sure we got a stream object`
`107`	`107`	`mp_get_stream_raise(args[0],MP_STREAM_OP_READ \|MP_STREAM_OP_WRITE \|MP_STREAM_OP_IOCTL);`
`108`	`108`
`@@ -118,7 +118,7 @@ STATIC mp_obj_t btree_open(size_t n_args, const mp_obj_t *args) {`
`118`	`118`
`119`	`119`	`returnMP_OBJ_FROM_PTR(btree_new(db,args[0]));`
`120`	`120`	`}`
`121`		`-STATICMP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_open_obj,5,5,btree_open);`
	`121`	`+staticMP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(btree_open_obj,5,5,btree_open);`
`122`	`122`
`123`	`123`	`mp_obj_tmpy_init(mp_obj_fun_bc_tself,size_tn_args,size_tn_kw,mp_obj_targs) {`
`124`	`124`	`MP_DYNRUNTIME_INIT_ENTRY`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit290614c

File tree

481 files changed

Some content is hidden

481 files changed

`‎docs/develop/compiler.rst`

`‎docs/develop/library.rst`

`‎docs/develop/natmod.rst`

`‎docs/develop/porting.rst`

`‎drivers/bus/softqspi.c`

`‎drivers/cyw43/cywbt.c`

`‎drivers/dht/dht.c`

`‎drivers/esp-hosted/esp_hosted_hal.c`

`‎drivers/memory/spiflash.c`

`‎examples/natmod/btree/btree_c.c`

0 commit comments