Skip to content

Commit 0b3e56b

Browse files
bennydiamondbennydiamond
committed
-OnScreenKeyboard stops after 3 digit in last IP field.
-Rework on LPC registers. -Added info when acquiring IP address.
1 parent 2cd6244 commit 0b3e56b

File tree

13 files changed

+60
-46
lines changed

13 files changed

+60
-46
lines changed

‎Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CROM_CFLAGS=$(INCLUDE)
2020

2121
#You can override these if you wish.
2222
CFLAGS= -O2 -g -march=pentium -pipe -fomit-frame-pointer -Wstrict-prototypes -DIPv4 -fpack-struct
23+
#CFLAGS= -Os -march=pentium -pipe -fomit-frame-pointer -Wstrict-prototypes -DIPv4 -fpack-struct
2324

2425
# add the option for gcc 3.3 only, again, non-overridable
2526
ifeq ($(GCC_3.3), 1)
@@ -39,6 +40,7 @@ ETH_SUBDIRS = etherboot
3940
CROM_CFLAGS += -DETHERBOOT
4041
ETH_INCLUDE = -I$(TOPDIR)/etherboot/include -I$(TOPDIR)/etherboot/arch/i386/include
4142
ETH_CFLAGS = -O2 -march=pentium -Werror $(ETH_INCLUDE) -Wstrict-prototypes -fomit-frame-pointer -pipe -Ui386
43+
#ETH_CFLAGS = -Os -march=pentium -Werror $(ETH_INCLUDE) -Wstrict-prototypes -fomit-frame-pointer -pipe -Ui386
4244
endif
4345

4446
LDFLAGS-ROM = -s -S -T $(TOPDIR)/scripts/ldscript-crom.ld

‎XBlastMod register map.xlsx

45.4 KB
Binary file not shown.

‎boot/BootResetAction.c

+4-4
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ extern void BootResetAction ( void ) {
210210

211211
if(fHasHardware == SYSCON_ID_V1_TSOP){
212212
//LPCmodSettings.OSsettings.TSOPcontrol = (ReadFromIO(XODUS_CONTROL) & 0x20) >> 5; //A19ctrl maps to bit5
213-
LPCmodSettings.OSsettings.TSOPcontrol = GenPurposeIOs.A19BufEn;
213+
LPCmodSettings.OSsettings.TSOPcontrol = (u8)GenPurposeIOs.A19BufEn;
214214
}
215215

216216
BootLCDInit(); //Basic init. Do it even if no LCD is connected on the system.
@@ -283,17 +283,17 @@ extern void BootResetAction ( void ) {
283283
I2CTransmitByteGetReturn(0x10, 0x11); // dummy Query IRQ
284284
I2CWriteBytetoRegister(0x10, 0x03,0x00); // Clear Tray Register
285285
I2CTransmitWord(0x10, 0x0c01); // close DVD tray
286-
if(!EjectButtonPressed && LPCmodSettings.OSsettings.Quickboot == 1){ //White button NOT pressed and Quickboot ON.
286+
if(!EjectButtonPressed && LPCmodSettings.OSsettings.Quickboot == 1){ //Eject button NOT pressed and Quickboot ON.
287287
if(LPCmodSettings.OSsettings.activeBank > BOOTFROMTSOP){
288288
switchBootBank(LPCmodSettings.OSsettings.activeBank);
289289
}
290290
else{
291291
//WriteToIO(XODUS_CONTROL, RELEASED0); //Release D0
292292
//If booting from TSOP, use of the XODUS_CONTROL register is fine.
293293
if(mbVersion == REV1_6 || mbVersion == REVUNKNOWN)
294-
WriteToIO(XODUS_CONTROL, KILL_MOD); // switch to original bios. Mute modchip.
294+
switchBootBank(KILL_MOD); // switch to original bios. Mute modchip.
295295
else{
296-
WriteToIO(XODUS_CONTROL, LPCmodSettings.OSsettings.activeBank); // switch to original bios but modchip listen to LPC commands.
296+
switchBootBank(LPCmodSettings.OSsettings.activeBank); // switch to original bios but modchip listen to LPC commands.
297297
// Lock flash bank control with OSBNKCTRLBIT.
298298
}
299299
}

‎include/boot.h

+13-5
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,20 @@ bool TSOPRecoveryMode;
469469

470470
u8 currentFlashBank;
471471
u8 A19controlModBoot;
472+
472473
struct{
473-
u8 GPOport : 4;
474-
u8 GPIport : 2;
475-
u8 EN_5V : 1;
476-
u8 A19BufEn : 1;
477-
}__attribute__((packed))GenPurposeIOs;
474+
bool GPO3;
475+
bool GPO2;
476+
bool GPO1;
477+
bool GPO0;
478+
479+
bool GPI1;
480+
bool GPI0;
481+
482+
bool A19BufEn;
483+
484+
bool EN_5V;
485+
}__attribute__((packed))GenPurposeIOs; //byte-long struct.
478486

479487
//To show/hide stuff from public releases. Set to 1 for now but will need to be changed to 0 soon.
480488
#if 1

‎include/lpcmod_v1.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,16 @@
4040
#define READ5V 0x02
4141
#define READOSTSOPCTRL 0x01
4242

43-
//0xF70E write register bits configuration
43+
//0xF70D write register bits configuration
44+
#define GPO3_ON 0x80u
45+
#define GPO2_ON 0x40u
46+
#define GPO1_ON 0x20u
47+
#define GPO0_ON 0x10u
48+
#define ENABLE_5V 0x01u
49+
50+
//0xF70F write register bits configuration
4451
#define OSBNKCTRLBIT 0x80u //Bit that must be sent when selecting a flash bank other than BNKOS
52+
#define OSKILLMOD 0x20u //Completely mute modchip until a power cycle
4553
#define TSOPA19CTRLBIT 0x10u //Bit to enable manual drive of the TSOP's A19 pin.
4654
#define OSGROUNDD0 0x04u //Won't be used much here.
4755
#define TSOPFULLBOOT 0x00u
@@ -53,13 +61,6 @@
5361
#define BNK256 0x86u
5462
#define BNKOS 0x87u
5563

56-
//0xF70F write register bits configuration
57-
#define GPO3_ON 0x80u
58-
#define GPO2_ON 0x40u
59-
#define GPO1_ON 0x20u
60-
#define GPO0_ON 0x10u
61-
#define ENNABLE_5V 0x01u
62-
6364

6465

6566
#define LPCMOD_TRUE 0x01u
@@ -68,9 +69,8 @@
6869

6970
//XBlast Mod and SmartXX LPC registers to drive LCD
7071
#define XBLAST_IO 0xF70Du
71-
#define XBLAST_CONTROL 0xF70Eu
72+
#define XBLAST_CONTROL 0xF70Fu
7273
#define XODUS_CONTROL 0x00FFu
73-
#define PIN_CONTROL 0xF70Fu
7474
#define LCD_DATA 0xF700u
7575
#define LCD_BL 0xF701u
7676
#define LCD_CT 0xF703u

‎lib/LPCMod/BootLCD.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ void BootLCDInit(void){
3333
void toggleEN5V(u8 value){
3434
xF70FLPCRegister &= 0xFE; //Remove bit setting regarding Enable_5V state
3535
xF70FLPCRegister |= (value & 0x01); //Add in proper bit if value if necessary.
36-
WriteToIO(PIN_CONTROL, xF70FLPCRegister); //Write to LPC register
36+
WriteToIO(XBLAST_IO, xF70FLPCRegister); //Write to LPC register
3737
}
3838

3939
void setLCDContrast(u8 value){

‎lib/misc/OnScreenKeyboard.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ void OnScreenKeyboard(char * string, u8 maxLength, u8 line, u8 kbType) {
7373
for(y = 0; y < 4; y++){
7474
if(kbType == IP_KEYPAD){
7575
if(y == 3)
76-
printk("\n\n\n "); //Add extra space to align with other rows
76+
printk("\n\n\n "); //Add extra space to align with other rows
7777
else
78-
printk("\n\n\n ");
78+
printk("\n\n\n ");
7979
}
8080
else{
8181
printk("\n\n\n ");
@@ -165,7 +165,8 @@ void OnScreenKeyboard(char * string, u8 maxLength, u8 line, u8 kbType) {
165165
string[textpos] = ipKeypad[cursorposY][cursorposX];
166166
string[textpos + 1] = '.';
167167
}
168-
else if(dotCount <= 3 && ipFieldLength < 3){ //Normal IP field write.
168+
else if((dotCount <= 3 && ipFieldLength < 2) || //Normal IP field write.
169+
(dotCount == 3 && ipFieldLength == 2)){ //or last possible character to write
169170
charAccepted = true;
170171
string[textpos] = ipKeypad[cursorposY][cursorposX];
171172
string[textpos + 1] = '\0'; //Safe in this situation. Will not write outside buffer because of maxLength's check.

‎lwip/ebd.c

+14-4
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ int
131131
run_lwip (void) {
132132
struct ip_addr ipaddr, netmask, gw;
133133
struct netif netif;
134+
int first = 1;
134135

135136
mem_init ();
136137
memp_init ();
@@ -161,8 +162,14 @@ run_lwip (void) {
161162
LPCmodSettings.OSsettings.staticMask[3]);
162163

163164
netif_add (&netif, &ipaddr, &netmask, &gw, NULL, ebd_init, ip_input);
164-
if (LPCmodSettings.OSsettings.useDHCP)
165+
if (LPCmodSettings.OSsettings.useDHCP){
165166
dhcp_start (&netif);
167+
printk ("\n DHCP Attempt - Received %u.%u.%u.%u",
168+
(netif.dhcp->offered_ip_addr.addr & 0xff000000) >> 24,
169+
(netif.dhcp->offered_ip_addr.addr & 0x00ff0000) >> 16,
170+
(netif.dhcp->offered_ip_addr.addr & 0x0000ff00) >> 8,
171+
netif.dhcp->offered_ip_addr.addr & 0x000000ff);
172+
}
166173
else {
167174
//Not necessary, but polite.
168175
dhcp_stop (&netif);
@@ -178,15 +185,18 @@ run_lwip (void) {
178185
httpd_init ();
179186

180187
int divisor = 0;
181-
int first = 1;
182188
while (1) {
183189
//printk ("while(1)");
184190
if (!ebd_wait (&netif, TCP_TMR_INTERVAL)) {
185191
//printk ("!ebd_wait");
186192
if (divisor++ == 60 * 4) {
187193
if (first) {
188194
if (netif.dhcp->state != DHCP_BOUND && LPCmodSettings.OSsettings.useDHCP) {
189-
printk (" DHCP FAILED - Falling back to 192.168.0.250\n");
195+
printk ("\n DHCP FAILED - Falling back to %u.%u.%u.%u",
196+
(ipaddr.addr & 0xff000000) >> 24,
197+
(ipaddr.addr & 0x00ff0000) >> 16,
198+
(ipaddr.addr & 0x0000ff00) >> 8,
199+
ipaddr.addr & 0x000000ff);
190200
dhcp_stop (&netif);
191201
netif_set_addr(&netif, &ipaddr, &netmask, &gw);
192202
}
@@ -195,8 +205,8 @@ run_lwip (void) {
195205
((netif.ip_addr.addr) >> 16 & 0xff),
196206
((netif.ip_addr.addr) >> 8 & 0xff),
197207
((netif.ip_addr.addr) & 0xff));
208+
first = 0;
198209
}
199-
first = 0;
200210
dhcp_coarse_tmr ();
201211
divisor = 0;
202212
}

‎menu/actions/DeveloperMenuActions.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ void GPIORead(void * ignored){
173173
ToolHeader("Read GPI/O");
174174
u8 * structPtr = (u8 *)&GenPurposeIOs;
175175
*structPtr = ReadFromIO(XBLAST_IO);
176-
printk("\n\n\2 GPO : 0b%u%u%u%u", (GenPurposeIOs.GPOport >> 3) & 0x01, (GenPurposeIOs.GPOport >> 2) & 0x01, (GenPurposeIOs.GPOport >> 1) & 0x01, GenPurposeIOs.GPOport & 0x01);
177-
printk("\n\2 GPI : 0b%u%u", (GenPurposeIOs.GPIport >> 1) & 0x01, GenPurposeIOs.GPIport & 0x01);
176+
printk("\n\n\2 GPO : 0b%u%u%u%u", GenPurposeIOs.GPO3, GenPurposeIOs.GPO2, GenPurposeIOs.GPO1, GenPurposeIOs.GPO0);
177+
printk("\n\2 GPI : 0b%u%u", GenPurposeIOs.GPI1, GenPurposeIOs.GPI0);
178178
printk("\n\2 A19Ctrl : 0b%u", GenPurposeIOs.A19BufEn);
179179
printk("\n\2 EN_5V : 0b%u", GenPurposeIOs.EN_5V);
180180
ToolFooter();

‎menu/actions/MenuActions.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ void BootOriginalBios(void *data) {
3535

3636
BootStopUSB();
3737

38-
if(fHasHardware == SYSCON_ID_V1 && cromwell_config==CROMWELL){
38+
if((fHasHardware == SYSCON_ID_V1 && cromwell_config==CROMWELL) || fHasHardware == SYSCON_ID_V1_TSOP){
3939
//WriteToIO(XODUS_CONTROL, RELEASED0); //Release D0
4040
if(mbVersion == REV1_6 || mbVersion == REVUNKNOWN)
41-
switchBootBank(KILL_MOD); // switch to original bios. Mute modchip.
41+
switchBootBank(KILL_MOD); // switch to original bios. Mute modchip.
4242
else
4343
switchBootBank(*(u8*)data); // switch to original bios but modchip listen to LPC commands.
4444

@@ -59,14 +59,14 @@ void BootModBios(void *data) {
5959

6060
BootStopUSB();
6161

62-
if(cromwell_config==CROMWELL)
62+
if(cromwell_config==CROMWELL || fHasHardware == SYSCON_ID_V1_TSOP)
6363
I2CTransmitWord(0x10, 0x1b00 + ( I2CTransmitByteGetReturn(0x10, 0x1b) & 0xfb )); // clear noani-bit
6464
else
6565
I2CTransmitWord(0x10, 0x1b00 + ( I2CTransmitByteGetReturn(0x10, 0x1b) | 0x04 )); // set noani-bit
6666
I2CRebootQuick();
6767
while(1);
6868
}
69-
69+
/*
7070
void BootFromCD(void *data) {
7171
BootFlashSaveOSSettings();
7272
assertWriteEEPROM();
@@ -85,7 +85,7 @@ void BootFromCD(void *data) {
8585
}
8686
DrawBootMenu(config);
8787
}
88-
/*
88+
8989
void BootFromNet(void *whatever) {
9090
extern unsigned char *videosavepage;
9191
memcpy((void*)FB_START,videosavepage,FB_SIZE);

‎menu/actions/MenuActions.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ void DrawBootMenu(void *entry);
2626
void BootMenuEntry(void *entry);
2727

2828
//Ick, this needs to be removed.
29-
void BootFromCD(void *driveId);
30-
void BootFromNet(void *whatever);
29+
//void BootFromCD(void *driveId);
30+
//void BootFromNet(void *whatever);
3131

3232
#ifdef FLASH
3333
//void FlashBios(void *);
@@ -43,7 +43,4 @@ void BootOriginalBios(void * data);
4343
// Booting 256k Modbios
4444
void BootModBios(void * data);
4545

46-
// Booting 512k Modbios
47-
void BootModBios2(void * data);
48-
4946
#endif

‎menu/textmenu/ResetMenuInit.c

-4
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ TEXTMENU* ResetMenuInit(void) {
1919
memset(menuPtr,0x00,sizeof(TEXTMENU));
2020
strcpy(menuPtr->szCaption, "Power Menu");
2121

22-
//No entry in this menu will have a configurable parameter.
23-
//Set first character to NULL to indicate no string is to be shown.
24-
itemPtr->szParameter[0]=0;
25-
2622
itemPtr = (TEXTMENUITEM*)malloc(sizeof(TEXTMENUITEM));
2723
memset(itemPtr,0x00,sizeof(TEXTMENUITEM));
2824
strcpy(itemPtr->szCaption, "Reboot");

‎trashcode/lwip/src/core/dhcp.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -779,10 +779,10 @@ static void dhcp_bind(struct netif *netif)
779779

780780
LWIP_DEBUGF(DHCP_DEBUG | DBG_STATE, ("dhcp_bind(): IP: 0x%08lx\n", dhcp->offered_ip_addr.addr));
781781
printk ("%d.%d.%d.%d (DHCP), %d.%d.%d.%d(MASK)\n",
782-
(dhcp->offered_ip_addr.addr & 0x000000ff) ,
783-
(dhcp->offered_ip_addr.addr & 0x0000ff00) >> 8,
784-
(dhcp->offered_ip_addr.addr & 0x00ff0000) >> 16,
785782
(dhcp->offered_ip_addr.addr & 0xff000000) >> 24,
783+
(dhcp->offered_ip_addr.addr & 0x00ff0000) >> 16,
784+
(dhcp->offered_ip_addr.addr & 0x0000ff00) >> 8,
785+
(dhcp->offered_ip_addr.addr & 0x000000ff) ,
786786
(sn_mask.addr & 0x000000ff) ,
787787
(sn_mask.addr & 0x0000ff00) >> 8,
788788
(sn_mask.addr & 0x00ff0000) >> 16,

0 commit comments

Comments
 (0)