Page MenuHomeFreeBSD
Files F146310961

D8874.id.diff
No OneTemporary
Actions

D8874.id.diff
View Options

Index: head/sys/arm/freescale/imx/imx6_sdma.h
===================================================================
--- head/sys/arm/freescale/imx/imx6_sdma.h
+++ head/sys/arm/freescale/imx/imx6_sdma.h
@@ -221,8 +221,8 @@
uint32_t num_bd;
uint32_t ccb_phys;
uint32_t context_phys;
- struct sdma_firmware_header *fw_header;
- struct sdma_script_start_addrs *fw_scripts;
+ const struct sdma_firmware_header *fw_header;
+ const struct sdma_script_start_addrs *fw_scripts;
};
struct sdma_conf {
Index: head/sys/arm/freescale/imx/imx6_sdma.c
===================================================================
--- head/sys/arm/freescale/imx/imx6_sdma.c
+++ head/sys/arm/freescale/imx/imx6_sdma.c
@@ -351,7 +351,7 @@
static int
load_firmware(struct sdma_softc *sc)
{
- struct sdma_firmware_header *header;
+ const struct sdma_firmware_header *header;
const struct firmware *fp;
fp = firmware_get("sdma_fw");
@@ -360,14 +360,14 @@
return (-1);
}
- header = (struct sdma_firmware_header *)fp->data;
+ header = fp->data;
if (header->magic != FW_HEADER_MAGIC) {
device_printf(sc->dev, "Can't use firmware.\n");
return (-1);
}
sc->fw_header = header;
- sc->fw_scripts = (void *)((char *)header +
+ sc->fw_scripts = (const void *)((const char *)header +
header->script_addrs_start);
return (0);
@@ -377,14 +377,14 @@
boot_firmware(struct sdma_softc *sc)
{
struct sdma_buffer_descriptor *bd0;
- uint32_t *ram_code;
+ const uint32_t *ram_code;
int timeout;
int ret;
int chn;
int sz;
int i;
- ram_code = (void *)((char *)sc->fw_header +
+ ram_code = (const void *)((const char *)sc->fw_header +
sc->fw_header->ram_code_start);
/* Make sure SDMA has not started yet */
@@ -514,4 +514,5 @@
static devclass_t sdma_devclass;
-DRIVER_MODULE(sdma, simplebus, sdma_driver, sdma_devclass, 0, 0);
+EARLY_DRIVER_MODULE(sdma, simplebus, sdma_driver, sdma_devclass, 0, 0,
+ BUS_PASS_RESOURCE);

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 2, 3:27 PM (18 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29162393
Default Alt Text
D8874.id.diff (1 KB)

Event Timeline