Skip to contentSkip to conversation

splash: Use splashfile instead of location->name

PATCH Superseded Jonas Mark (BT-FIR/ENG1) 2 participants 2 messages Feb 6, 2019 – Feb 7, 2019

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/2 splash: Use splashfile instead of location->name

Hi Tomas,

Quoted 16 lines
Quoted 6 lines
Quoted 6 lines

So my initial question still stands, could existing implementation be kept as fallback?

(quoted diff) +2 -0
+	if (!splash_file)
+		splash_file = location->name;
Quoted 9 lines
Quoted 3 lines

location->name has worked fine for those cases, so it would be nice location->to
keep that option intact.

I think that the .name field of struct splash_location is actually intended to hold a human readable name for the storage itself. That the code so far uses the storage location name synonymously with the splash screen name is unfortunate. That's why we decided to fix this. I am convinced that the patch actually makes it easier for others to start reading splash screens from a FIT image.

Quoted 2 lines

If I understand the original issue you had correctly, could it also have been fixed by renaming splash node in FIT image?

Yes, that's we actually started with. But once we started adding more files to that FIT image we saw the problem: Then we had files in the FIT image with "nice" names and one "ugly duckling". Now it is fixed.

Patch 2/2 shows more things we fixed on the way and are now contributing.

Quoted 8 lines
Quoted 4 lines

Why do I think so? Because the behavior is now consistent to what splash_load_fs() does. That is, if there is an environment variable "splashfile" the splash screen name is taken from there. Else, the fixed default name "splash.bmp" is used.

Symmetry is nice, so ok. But still, it now rules out the possiblity to use the splash name in the FIT without defining additional "splashfile" to the env.

This is not correct. In case you do not define "splashfile" in the environment the consistent (!) default name is "splash.bmp".

Regards,
Mark

Building Technologies, Panel Software Fire (BT-FIR/ENG1)
Bosch Sicherheitssysteme GmbH | Postfach 11 11 | 85626 Grasbrunn | GERMANY | www.boschsecurity.com

Sitz: Stuttgart, Registergericht: Amtsgericht Stuttgart HRB 23118
Aufsichtsratsvorsitzender: Christian Fischer; Geschäftsführung: Tanja Rückert, Andreas Bartz, Thomas Quante, Bernhard Schuster

#1 lore raw

PATCH v2 1/2 splash: Use splashfile instead of location->name

Hi Mark,

Quoted 5 lines · On 2/6/19 5:42 PM, Jonas Mark (BT-FIR/ENG1) wrote:
Quoted 2 lines

If I understand the original issue you had correctly, could it also have been fixed by renaming splash node in FIT image?

Yes, that's we actually started with. But once we started adding more files to that FIT image we saw the problem: Then we had files in the FIT image with "nice" names and one "ugly duckling". Now it is fixed.

The same end result could be achieved by selecting an appropriate name for the 'splash_location' 'name' field, sounds like no need for new env variable.

But please fill in if there is something more to the original problem

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

Why do I think so? Because the behavior is now consistent to what splash_load_fs() does. That is, if there is an environment variable "splashfile" the splash screen name is taken from there. Else, the fixed default name "splash.bmp" is used.

Except there is an important difference. This is loading a node from a FIT image, not a file from a file system.

The patch sets the default _node_ name to look for in the FIT to be "splash.bmp", that's a rather odd name for a FIT node.

Quoted 5 lines
Quoted 3 lines

Symmetry is nice, so ok. But still, it now rules out the possiblity to use the splash name in the FIT without defining additional "splashfile" to the env.

This is not correct. In case you do not define "splashfile" in the environment the consistent (!) default name is "splash.bmp".

No, that's not what I meant. Prior to the change, splash node name in FIT could be selected freely

without adding "splashfile" to environment. That's not longer possible.

BR,

Tomas