Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 32d019265d1f0c334f2f86407abf295d46bd2f4d

Authored by Hans de Goede
Committed by Marek Vasut
1 parent 3f78a28037
Exists in v2017.01-smarct4x and in 37 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

stdio: Add force parameter to stdio_deregister 

In some cases we really want to move forward with a deregister, add a force
parameter to allow this, and replace the dev with a nulldev in this case.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>

Showing 4 changed files with 14 additions and 7 deletions Side-by-side Diff

... ... @@ -34,6 +34,9 @@
34 34 #define CONFIG_SYS_DEVICE_NULLDEV 1
35 35 #endif
36 36  
  37 +#ifdef CONFIG_SYS_STDIO_DEREGISTER
  38 +#define CONFIG_SYS_DEVICE_NULLDEV 1
  39 +#endif
37 40  
38 41 #ifdef CONFIG_SYS_DEVICE_NULLDEV
39 42 void nulldev_putc(struct stdio_dev *dev, const char c)
... ... @@ -172,7 +175,7 @@
172 175 * returns 0 if success, -1 if device is assigned and 1 if devname not found
173 176 */
174 177 #ifdef CONFIG_SYS_STDIO_DEREGISTER
175   -int stdio_deregister_dev(struct stdio_dev *dev)
  178 +int stdio_deregister_dev(struct stdio_dev *dev, int force)
176 179 {
177 180 int l;
178 181 struct list_head *pos;
... ... @@ -181,6 +184,10 @@
181 184 /* get stdio devices (ListRemoveItem changes the dev list) */
182 185 for (l=0 ; l< MAX_FILES; l++) {
183 186 if (stdio_devices[l] == dev) {
  187 + if (force) {
  188 + strcpy(temp_names[l], "nulldev");
  189 + continue;
  190 + }
184 191 /* Device is assigned -> report error */
185 192 return -1;
186 193 }
... ... @@ -202,7 +209,7 @@
202 209 return 0;
203 210 }
204 211  
205   -int stdio_deregister(const char *devname)
  212 +int stdio_deregister(const char *devname, int force)
206 213 {
207 214 struct stdio_dev *dev;
208 215  
... ... @@ -211,7 +218,7 @@
211 218 if (!dev) /* device not found */
212 219 return -ENODEV;
213 220  
214   - return stdio_deregister_dev(dev);
  221 + return stdio_deregister_dev(dev, force);
215 222 }
216 223 #endif /* CONFIG_SYS_STDIO_DEREGISTER */
217 224  
... ... @@ -550,7 +550,7 @@
550 550 int usb_kbd_deregister(void)
551 551 {
552 552 #ifdef CONFIG_SYS_STDIO_DEREGISTER
553   - int ret = stdio_deregister(DEVNAME);
  553 + int ret = stdio_deregister(DEVNAME, 0);
554 554 if (ret && ret != -ENODEV)
555 555 return ret;
556 556  
drivers/serial/serial-uclass.c
Diff comments   View file @ 32d0192
... ... @@ -198,7 +198,7 @@
198 198 #ifdef CONFIG_SYS_STDIO_DEREGISTER
199 199 struct serial_dev_priv *upriv = dev->uclass_priv;
200 200  
201   - if (stdio_deregister_dev(upriv->sdev))
  201 + if (stdio_deregister_dev(upriv->sdev), 0)
202 202 return -EPERM;
203 203 #endif
204 204  
... ... @@ -103,8 +103,8 @@
103 103  
104 104 void stdio_print_current_devices(void);
105 105 #ifdef CONFIG_SYS_STDIO_DEREGISTER
106   -int stdio_deregister(const char *devname);
107   -int stdio_deregister_dev(struct stdio_dev *dev);
  106 +int stdio_deregister(const char *devname, int force);
  107 +int stdio_deregister_dev(struct stdio_dev *dev, int force);
108 108 #endif
109 109 struct list_head* stdio_get_list(void);
110 110 struct stdio_dev* stdio_get_by_name(const char* name);