Chameleon

Chameleon Commit Details

Date:2011-05-29 20:54:51 (12 years 10 months ago)
Author:Kabyl
Commit:915
Parents: 914
Message:Show the user specified AtiConfig, add svn revision and build timestamp to booter log
Changes:
M/trunk/Makefile
M/trunk/i386/libsaio/console.c
M/trunk/i386/libsaio/ati.c
M/trunk/i386/boot2/Makefile

File differences

trunk/i386/libsaio/console.c
4646
4747
4848
49
4950
5051
5152
......
9091
9192
9293
94
9395
9496
9597
␊
#include "libsaio.h"␊
#include "bootstruct.h"␊
#include <vers.h>␊
␊
extern int␉vprf(const char * fmt, va_list ap);␊
␊
␉msgbuf = malloc(BOOTER_LOG_SIZE);␊
␉bzero(msgbuf, BOOTER_LOG_SIZE);␊
␉cursor = msgbuf;␊
␉msglog("%s\n", "Chameleon " I386BOOT_CHAMELEONVERSION " (svn-r" I386BOOT_CHAMELEONREVISION ")" " [" I386BOOT_BUILDDATE "]");␊
}␊
␊
void msglog(const char * fmt, ...)␊
trunk/i386/libsaio/ati.c
539539
540540
541541
542
542543
543544
544545
......
11001101
11011102
11021103
1103
11041104
11051105
11061106
......
11641164
11651165
11661166
1167
1168
1167
1168
11691169
1170
1170
11711171
11721172
11731173
11741174
11751175
1176
1176
11771177
11781178
11791179
1180
1180
11811181
11821182
11831183
11841184
1185
1185
11861186
11871187
11881188
......
12281228
12291229
12301230
1231
1231
12321232
12331233
12341234
␉uint8_t␉␉␉␉␉*rom;␊
␉uint32_t␉␉␉␉rom_size;␊
␉uint32_t␉␉␉␉vram_size;␊
␉const char␉␉␉␉*cfg_name;␊
␉uint8_t␉␉␉␉␉ports;␊
␉uint32_t␉␉␉␉flags;␊
␉bool␉␉␉␉␉posted;␊
␊
static bool init_card(pci_dt_t *pci_dev)␊
{␊
␉const char *fb_name;␊
␉char name[24];␊
␉char name_parent[24];␊
␉int i;␊
␊
␉atN = 0;␊
␊
␉fb_name = getStringForKey(kAtiConfig, &bootInfo->bootConfig);␊
␉if (!fb_name)␊
␉card->cfg_name = getStringForKey(kAtiConfig, &bootInfo->bootConfig);␊
␉if (!card->cfg_name)␊
␉{␊
␉␉fb_name = card_configs[card->info->cfg_name].name;␊
␉␉card->cfg_name = card_configs[card->info->cfg_name].name;␊
␉␉card->ports = card_configs[card->info->cfg_name].ports;␊
␉}␊
␉else␊
␉{␊
␉␉for (i = 0; i < kCfgEnd; i++)␊
␉␉␉if (strcmp(fb_name, card_configs[i].name) == 0)␊
␉␉␉if (strcmp(card->cfg_name, card_configs[i].name) == 0)␊
␉␉␉␉card->ports = card_configs[i].ports;␊
␉}␊
␊
␉sprintf(name, "ATY,%s", fb_name);␊
␉sprintf(name, "ATY,%s", card->cfg_name);␊
␉aty_name.type = kStr;␊
␉aty_name.size = strlen(name) + 1;␊
␉aty_name.data = (uint8_t *)name;␊
␊
␉sprintf(name_parent, "ATY,%sParent", fb_name);␊
␉sprintf(name_parent, "ATY,%sParent", card->cfg_name);␊
␉aty_nameparent.type = kStr;␊
␉aty_nameparent.size = strlen(name_parent) + 1;␊
␉aty_nameparent.data = (uint8_t *)name_parent;␊
␊
␉verbose("ATI %s %s %dMB (%s) [%04x:%04x] (subsys [%04x:%04x]):: %s\n", ␊
␉␉␉chip_family_name[card->info->chip_family], card->info->model_name, ␊
␉␉␉(uint32_t)(card->vram_size / (1024 * 1024)), card_configs[card->info->cfg_name].name, ␊
␉␉␉(uint32_t)(card->vram_size / (1024 * 1024)), card->cfg_name, ␊
␉␉␉ati_dev->vendor_id, ati_dev->device_id,␊
␉␉␉ati_dev->subsys_id.subsys.vendor_id, ati_dev->subsys_id.subsys.device_id, ␊
␉␉␉devicepath);␊
trunk/i386/boot2/Makefile
156156
157157
158158
159
160
161
162
163
164
165159
166160
167161
␉@$(SYMROOT)/machOconv $(SYMROOT)/boot.sys $(SYMROOT)/boot␊
␊
␉␊
$(SYMROOT)/vers.h:␊
␉@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/vers.h␊
␉@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $(SYMROOT)/vers.h␊
␉@echo "#define I386BOOT_CHAMELEONVERSION \"`cat ../../version`\"" >> $(SYMROOT)/vers.h␊
␉@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $(SYMROOT)/vers.h␊
␊
$(SYMROOT)/art.h:␊
␉@if [ "$(PNGCRUSH)" ]; then␉\␊
␉␉echo "optimizing art files ...\n$(PNGCRUSH) $(PNGOPTIONS) artwork/$(THEME)"; \␊
trunk/Makefile
5050
5151
5252
53
53
5454
5555
5656
......
8989
9090
9191
92
93
94
95
96
9297
9398
99
94100
95101
␉) || exit $$?; ␉␉␉␉␉␉ \␊
␊
␊
all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config␊
all: $(SYMROOT) $(OBJROOT) $(SRCROOT)/auto.conf $(SRCROOT)/autoconf.h $(SRCROOT)/autoconf.inc $(SRCROOT)/.config vers.h␊
␉@if [ -e ".svn" ]; then svnversion -n | tr -d [:alpha:] > revision; fi␊
␉@if [ -z "$(RC_ARCHS)" ]; then␉␉␉␉␉ \␊
␉␉RC_ARCHS="i386";␉␉␉␉␉ \␊
␉ fi;␉␉␉␉␉␉␉␉ \␊
␉done␊
␊
vers.h:␊
␉@echo "#define I386BOOT_VERSION \"5.0.132\"" > $(SYMROOT)/i386/vers.h␊
␉@echo "#define I386BOOT_BUILDDATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $(SYMROOT)/i386/vers.h␊
␉@echo "#define I386BOOT_CHAMELEONVERSION \"`cat version`\"" >> $(SYMROOT)/i386/vers.h␊
␉@echo "#define I386BOOT_CHAMELEONREVISION \"`svnversion -n | tr -d [:alpha:]`\"" >> $(SYMROOT)/i386/vers.h␊
␊
␊
␊
.PHONY: config␊
.PHONY: clean␊

Archive Download the corresponding diff file

Revision: 915