On Thu, Mar 17, 2022 at 08:03:20AM +0000, Miod Vallat wrote:
> sys/dev/sdmmc/devlist2h.awk was based upon sys/dev/pcmcia/devlist2h.awk.
> The latter contains code to define optional CIS tuple overrides, which
> are not used in sdmmc - there is only one override and it is applied in
> sdmmc_check_cis_quirks().
>
> The following diff removes this feature from devlist2h. As a result,
> there will no longer be SDMMC_CIS_* defines in sdmmcdevs.h.
ok jsg@
>
> Index: devlist2h.awk
> ===================================================================
> RCS file: /OpenBSD/src/sys/dev/sdmmc/devlist2h.awk,v
> retrieving revision 1.2
> diff -u -p -r1.2 devlist2h.awk
> --- devlist2h.awk 2 Jun 2006 21:16:44 -0000 1.2
> +++ devlist2h.awk 17 Mar 2022 07:59:44 -0000
> @@ -80,7 +80,6 @@ NR == 1 {
> $1 == "vendor" {
> nvendors++
>
> - vendorindex[$2] = nvendors; # record index for this name,
> for later.
> vendors[nvendors, 1] = $2; # name
> vendors[nvendors, 2] = $3; # id
> printf("#define\tSDMMC_VENDOR_%s\t%s\t", vendors[nvendors, 1],
> @@ -95,45 +94,8 @@ $1 == "product" {
> products[nproducts, 1] = $2; # vendor name
> products[nproducts, 2] = $3; # product id
> products[nproducts, 3] = $4; # id
> -
> - f = 5;
> -
> - if ($4 == "{") {
> - products[nproducts, 3] = "SDMMC_PRODUCT_INVALID"
> - z = "{ "
> - for (i = 0; i < 4; i++) {
> - if (f <= NF) {
> - gsub("&sp", " ", $f)
> - gsub("&tab", "\t", $f)
> - gsub("&nl", "\n", $f)
> - z = z $f " "
> - f++
> - }
> - else {
> - if (i == 3)
> - z = z "NULL "
> - else
> - z = z "NULL, "
> - }
> - }
> - products[nproducts, 4] = z $f
> - f++
> - }
> - else {
> - products[nproducts, 4] = "{ NULL, NULL, NULL, NULL }"
> - }
> - printf("#define\tSDMMC_CIS_%s_%s\t%s\n",
> - products[nproducts, 1], products[nproducts, 2],
> - products[nproducts, 4]) > hfile
> printf("#define\tSDMMC_PRODUCT_%s_%s\t%s\n", products[nproducts, 1],
> products[nproducts, 2], products[nproducts, 3]) > hfile
> -
> -# products[nproducts, 5] = collectline(f, line)
> -#
> -# printf("#define\tSDMMC_STR_%s_%s\t\"%s\"\n",
> -# products[nproducts, 1], products[nproducts, 2],
> -# products[nproducts, 5]) > hfile
> -
> next
> }
> {
>
>
