patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity
zephyr/drivers/display
History
Tomasz Bursztyka 4dcfb5531c isr: Normalize usage of device instance through ISR 
The goal of this patch is to replace the 'void *' parameter by 'struct
device *' if they use such variable or just 'const void *' on all
relevant ISRs

This will avoid not-so-nice const qualifier tweaks when device instances
will be constant.

Note that only the ISR passed to IRQ_CONNECT are of interest here.

In order to do so, the script fix_isr.py below is necessary:

from pathlib import Path
import subprocess
import pickle
import mmap
import sys
import re
import os

cocci_template = """
@r_fix_isr_0
@
type ret_type;
identifier P;
identifier D;
@@
-ret_type <!fn!>(void *P)
+ret_type <!fn!>(const struct device *P)
{
 ...
(
 const struct device *D = (const struct device *)P;
|
 const struct device *D = P;
)
 ...
}

@r_fix_isr_1
@
type ret_type;
identifier P;
identifier D;
@@
-ret_type <!fn!>(void *P)
+ret_type <!fn!>(const struct device *P)
{
 ...
 const struct device *D;
 ...
(
 D = (const struct device *)P;
|
 D = P;
)
 ...
}

@r_fix_isr_2
@
type ret_type;
identifier A;
@@
-ret_type <!fn!>(void *A)
+ret_type <!fn!>(const void *A)
{
 ...
}

@r_fix_isr_3
@
const struct device *D;
@@
-<!fn!>((void *)D);
+<!fn!>(D);

@r_fix_isr_4
@
type ret_type;
identifier D;
identifier P;
@@
-ret_type <!fn!>(const struct device *P)
+ret_type <!fn!>(const struct device *D)
{
 ...
(
-const struct device *D = (const struct device *)P;
|
-const struct device *D = P;
)
 ...
}

@r_fix_isr_5
@
type ret_type;
identifier D;
identifier P;
@@
-ret_type <!fn!>(const struct device *P)
+ret_type <!fn!>(const struct device *D)
{
 ...
-const struct device *D;
...
(
-D = (const struct device *)P;
|
-D = P;
)
 ...
}
"""

def find_isr(fn):
    db = []
    data = None
    start = 0

    try:
        with open(fn, 'r+') as f:
            data = str(mmap.mmap(f.fileno(), 0).read())
    except Exception as e:
        return db

    while True:
        isr = ""
        irq = data.find('IRQ_CONNECT', start)
        while irq > -1:
            p = 1
            arg = 1
            p_o = data.find('(', irq)
            if p_o < 0:
                irq = -1
                break;

            pos = p_o + 1

            while p > 0:
                if data[pos] == ')':
                    p -= 1
                elif data[pos] == '(':
                    p += 1
                elif data[pos] == ',' and p == 1:
                    arg += 1

                if arg == 3:
                    isr += data[pos]

                pos += 1

            isr = isr.strip(',\\n\\t ')
            if isr not in db and len(isr) > 0:
                db.append(isr)

            start = pos
            break

        if irq < 0:
            break

    return db

def patch_isr(fn, isr_list):
    if len(isr_list) <= 0:
        return

    for isr in isr_list:
        tmplt = cocci_template.replace('<!fn!>', isr)
        with open('/tmp/isr_fix.cocci', 'w') as f:
            f.write(tmplt)

        cmd = ['spatch', '--sp-file', '/tmp/isr_fix.cocci', '--in-place', fn]

        subprocess.run(cmd)

def process_files(path):
    if path.is_file() and path.suffix in ['.h', '.c']:
        p = str(path.parent) + '/' + path.name
        isr_list = find_isr(p)
        patch_isr(p, isr_list)
    elif path.is_dir():
        for p in path.iterdir():
            process_files(p)

if len(sys.argv) < 2:
    print("You need to provide a dir/file path")
    sys.exit(1)

process_files(Path(sys.argv[1]))

And is run: ./fix_isr.py <zephyr root directory>

Finally, some files needed manual fixes such.

Fixes #27399

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
2020-09-02 13:48:13 +02:00
..
CMakeLists.txt drivers: display: add support for GD7965 display controller 2020-01-31 11:37:35 -05:00
display_dummy.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
display_framebuf.c zephyr: replace zephyr integer types with C99 types 2020-06-08 08:23:57 -05:00
display_ili9340.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
display_ili9340.h zephyr: replace zephyr integer types with C99 types 2020-06-08 08:23:57 -05:00
display_ili9340_adafruit_1480.c zephyr: replace zephyr integer types with C99 types 2020-06-08 08:23:57 -05:00
display_ili9340_seeed_tftv2.c zephyr: replace zephyr integer types with C99 types 2020-06-08 08:23:57 -05:00
display_mcux_elcdif.c isr: Normalize usage of device instance through ISR 2020-09-02 13:48:13 +02:00
display_sdl.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
display_st7789v.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
display_st7789v.h drivers: display_st7789v: obtain panel settings and parameters from DT 2020-01-02 17:00:06 -05:00
gd7965.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
gd7965_regs.h drivers: display: add support for GD7965 display controller 2020-01-31 11:37:35 -05:00
grove_lcd_rgb.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
Kconfig drivers: display: add support for GD7965 display controller 2020-01-31 11:37:35 -05:00
Kconfig.dummy kconfig: Clean up header comments and make them consistent 2019-11-04 17:31:27 -05:00
Kconfig.gd7965 drivers: display: add support for GD7965 display controller 2020-01-31 11:37:35 -05:00
Kconfig.grove license: cleanup: add SPDX Apache-2.0 license identifier 2019-04-07 08:45:22 -04:00
Kconfig.ili9340 kconfig: Clean up header comments and make them consistent 2019-11-04 17:31:27 -05:00
Kconfig.mcux_elcdif kconfig: Clean up header comments and make them consistent 2019-11-04 17:31:27 -05:00
Kconfig.microbit timeouts: Port BBC micro:bit to the new timeout API 2020-05-07 11:01:55 +02:00
Kconfig.sdl drivers: display: Add support for RGB565 to SDL display 2020-01-20 09:21:04 -06:00
Kconfig.ssd16xx kconfig: Clean up header comments and make them consistent 2019-11-04 17:31:27 -05:00
Kconfig.ssd1306 drivers: ssd1306: add choice symbol to controller type choice 2020-01-14 11:06:57 -05:00
Kconfig.st7789v kconfig: Replace some single-symbol 'if's with 'depends on' 2020-02-08 08:32:42 -05:00
mb_display.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
mb_font.c drivers: Add support for BBC micro:bit LED display 2017-04-04 08:14:36 +03:00
mb_font.h drivers: Add support for BBC micro:bit LED display 2017-04-04 08:14:36 +03:00
ssd16xx.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
ssd16xx_regs.h drivers: ssd16xx: support to load default WS from OTP 2020-06-17 12:31:20 +02:00
ssd1306.c device: Const-ify all device driver instance pointers 2020-09-02 13:48:13 +02:00
ssd1306_regs.h drivers: ssd1306: Support GPIO reset function 2019-02-22 10:32:43 -05:00