Skip to content

Commit e096919

Browse files
ZarithyaZarithya
committed
Cleanup
1 parent ccfe267 commit e096919

10 files changed

Lines changed: 458 additions & 532 deletions

File tree

‎gc/bte/bte.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ struct bte_pcb
140140
typedef s32 (*btecallback)(s32 result,void *userdata);
141141

142142
void BTE_Init(void);
143-
void BTE_Restart(void);
144143
void BTE_Shutdown(void);
145144
s32 BTE_InitCore(btecallback cb);
146145
s32 BTE_ApplyPatch(btecallback cb);

‎gc/ogc/conf.h‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ enum {
127127
};
128128

129129
#define CONF_PAD_MAX_REGISTERED 10
130-
#define CONF_PAD_MAX_ACTIVE 4
131-
#define CONF_PAD_TOTAL (CONF_PAD_MAX_REGISTERED + CONF_PAD_MAX_ACTIVE + 2)
132-
#define CONF_PAD_MAX_GUESTS 6
130+
#define CONF_PAD_MAX_ACTIVE 6
131+
#define CONF_PAD_MAX_WIIMOTES 4
132+
#define CONF_PAD_TOTAL (CONF_PAD_MAX_REGISTERED + CONF_PAD_MAX_ACTIVE)
133133

134134
typedef struct _conf_pad_device conf_pad_device;
135135

@@ -144,8 +144,6 @@ struct _conf_pads {
144144
u8 num_registered;
145145
conf_pad_device registered[CONF_PAD_MAX_REGISTERED];
146146
conf_pad_device active[CONF_PAD_MAX_ACTIVE];
147-
conf_pad_device balance_board;
148-
conf_pad_device unknown;
149147
} ATTRIBUTE_PACKED;
150148

151149
typedef struct _conf_pad_guest_device conf_pad_guest_device;
@@ -160,7 +158,7 @@ typedef struct _conf_pad_guests conf_pad_guests;
160158

161159
struct _conf_pad_guests {
162160
u8 num_guests;
163-
conf_pad_guest_device guests[CONF_PAD_MAX_GUESTS];
161+
conf_pad_guest_device guests[CONF_PAD_MAX_ACTIVE];
164162
} ATTRIBUTE_PACKED;
165163

166164
s32 CONF_Init(void);

‎gc/wiiuse/wpad.h‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ enum {
4343
WPAD_CHAN_2,
4444
WPAD_CHAN_3,
4545
WPAD_BALANCE_BOARD,
46-
WPAD_MAX_WIIMOTES,
46+
WPAD_CHAN_5,
47+
WPAD_MAX_DEVICES,
4748
};
4849

4950
#define WPAD_BUTTON_2 0x0001

‎libogc/conf.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ s32 CONF_SetPadGuestDevices(const conf_pad_guests *pads)
446446

447447
if (!pads) return CONF_EBADVALUE;
448448
count = pads->num_guests;
449-
if (count > CONF_PAD_MAX_GUESTS) return CONF_EBADVALUE;
449+
if (count > CONF_PAD_MAX_ACTIVE) return CONF_EBADVALUE;
450450
return CONF_Set("BT.CDIF", pads, sizeof(conf_pad_guests));
451451
}
452452

‎lwbt/bte.c‎

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717
#define STACKSIZE 32768
1818
#define MQ_BOX_SIZE 256
1919

20-
/* Vendor specific OGF */
21-
#define HCI_VENDOR_OGF 0x3f
22-
23-
/* Vendor specific OCF */
24-
#define HCI_VENDOR_PATCH_START_OCF 0x4f
25-
#define HCI_VENDOR_PATCH_CONT_OCF 0x4c
26-
#define HCI_VENDOR_PATCH_END_OCF 0x4f
27-
2820
enum bte_state {
2921
STATE_NOTREADY = -1,
3022
STATE_READY = 0,
@@ -407,18 +399,6 @@ void BTE_Init(void)
407399
SYS_SetPeriodicAlarm(btstate.timer_svc,&tb,&tb,bt_alarmhandler, NULL);
408400
}
409401

410-
void BTE_Restart(void)
411-
{
412-
u32 level;
413-
414-
_CPU_ISR_Disable(level);
415-
bte_reset_all();
416-
hci_reset_all();
417-
l2cap_reset_all();
418-
physbusif_reset_all();
419-
_CPU_ISR_Restore(level);
420-
}
421-
422402
void BTE_Shutdown(void)
423403
{
424404
u32 level;
@@ -755,7 +735,7 @@ s32 bte_connectdeviceasync(struct bte_pcb *pcb,struct bd_addr *bdaddr,s32 (*conn
755735

756736
error:
757737
_CPU_ISR_Restore(level);
758-
printf("bte_connectdeviceasync(%02x)\n",err);
738+
//printf("bte_connectdeviceasync(%02x)\n",err);
759739
return err;
760740
}
761741

@@ -1043,7 +1023,7 @@ err_t pin_req(void *arg,struct bd_addr *bdaddr)
10431023
// Pairing from 1+2 (guest/temporary)
10441024
bd_addr_set(&addr, bdaddr);
10451025
}
1046-
hci_pin_code_request_reply(bdaddr, BD_ADDR_LEN, addr.addr);
1026+
hci_pin_code_request_reply(bdaddr, sizeof(addr.addr), addr.addr);
10471027
return ERR_OK;
10481028
}
10491029

@@ -1337,27 +1317,27 @@ static err_t bte_hci_initcore_complete2(void *arg,struct hci_pcb *pcb,u8_t ogf,u
13371317
LOG("bte_hci_initcore_complete2(%02x,%02x)\n",ogf,ocf);
13381318
switch(ogf) {
13391319
case HCI_HC_BB_OGF:
1340-
if(ocf==HCI_WRITE_INQUIRY_MODE) {
1320+
if(ocf==HCI_W_INQUIRY_MODE_OCF) {
13411321
if(result==HCI_SUCCESS) {
13421322
hci_write_page_scan_type(0x01);
13431323
} else
13441324
err = ERR_CONN;
1345-
} else if(ocf==HCI_WRITE_PAGE_SCAN_TYPE) {
1325+
} else if(ocf==HCI_W_PAGE_SCAN_TYPE_OCF) {
13461326
if(result==HCI_SUCCESS) {
13471327
hci_write_inquiry_scan_type(0x01);
13481328
} else
13491329
err = ERR_CONN;
1350-
} else if(ocf==HCI_WRITE_INQUIRY_SCAN_TYPE) {
1330+
} else if(ocf==HCI_W_INQUIRY_SCAN_TYPE_OCF) {
13511331
if(result==HCI_SUCCESS) {
13521332
hci_write_cod(dev_cod);
13531333
} else
13541334
err = ERR_CONN;
1355-
} else if(ocf==HCI_WRITE_COD) {
1335+
} else if(ocf==HCI_W_COD_OCF) {
13561336
if(result==HCI_SUCCESS) {
13571337
hci_write_page_timeout(0x2000);
13581338
} else
13591339
err = ERR_CONN;
1360-
} else if(ocf==HCI_WRITE_PAGE_TIMEOUT) {
1340+
} else if(ocf==HCI_W_PAGE_TIMEOUT_OCF) {
13611341
if(result==HCI_SUCCESS) {
13621342
state->hci_inited = 1;
13631343
hci_cmd_complete(NULL);
@@ -1384,23 +1364,23 @@ err_t bte_hci_initcore_complete(void *arg,struct hci_pcb *pcb,u8_t ogf,u8_t ocf,
13841364

13851365
LOG("bte_hci_initcore_complete(%02x,%02x)\n",ogf,ocf);
13861366
switch(ogf) {
1387-
case HCI_INFO_PARAM:
1388-
if(ocf==HCI_READ_BUFFER_SIZE) {
1367+
case HCI_INFO_PARAM_OGF:
1368+
if(ocf==HCI_R_BUF_SIZE_OCF) {
13891369
if(result==HCI_SUCCESS) {
13901370
hci_write_cod(dev_cod);
13911371
} else
13921372
err = ERR_CONN;
1393-
} else if(ocf==HCI_READ_LOCAL_VERSION) {
1373+
} else if(ocf==HCI_R_LOC_VERS_INFO_OCF) {
13941374
if(result==HCI_SUCCESS) {
13951375
hci_read_bd_addr();
13961376
} else
13971377
err = ERR_CONN;
1398-
} else if(ocf==HCI_READ_BD_ADDR) {
1378+
} else if(ocf==HCI_R_BD_ADDR_OCF) {
13991379
if(result==HCI_SUCCESS) {
14001380
hci_read_local_features();
14011381
} else
14021382
err = ERR_CONN;
1403-
} else if(ocf==HCI_READ_LOCAL_FEATURES) {
1383+
} else if(ocf==HCI_R_LOC_FEAT_OCF) {
14041384
if(result==HCI_SUCCESS) {
14051385
hci_cmd_complete(bte_hci_initcore_complete2);
14061386
hci_write_inquiry_mode(0x01);
@@ -1409,27 +1389,27 @@ err_t bte_hci_initcore_complete(void *arg,struct hci_pcb *pcb,u8_t ogf,u8_t ocf,
14091389
}
14101390
break;
14111391
case HCI_HC_BB_OGF:
1412-
if(ocf==HCI_RESET) {
1392+
if(ocf==HCI_RESET_OCF) {
14131393
if(result==HCI_SUCCESS) {
14141394
hci_read_buffer_size();
14151395
} else
14161396
err = ERR_CONN;
1417-
} else if(ocf==HCI_WRITE_COD) {
1397+
} else if(ocf==HCI_W_COD_OCF) {
14181398
if(result==HCI_SUCCESS) {
14191399
hci_write_local_name((u8_t*)"",1);
14201400
} else
14211401
err = ERR_CONN;
1422-
} else if(ocf==HCI_WRITE_LOCAL_NAME) {
1402+
} else if(ocf==HCI_W_LOCAL_NAME_OCF) {
14231403
if(result==HCI_SUCCESS) {
14241404
hci_write_pin_type(0x00);
14251405
} else
14261406
err = ERR_CONN;
1427-
} else if(ocf==HCI_WRITE_PIN_TYPE) {
1407+
} else if(ocf==HCI_W_PIN_TYPE_OCF) {
14281408
if(result==HCI_SUCCESS) {
14291409
hci_host_buffer_size();
14301410
} else
14311411
err = ERR_CONN;
1432-
} else if(ocf==HCI_HOST_BUF_SIZE) {
1412+
} else if(ocf==HCI_HOST_BUF_SIZE_OCF) {
14331413
if(result==HCI_SUCCESS) {
14341414
hci_read_local_version();
14351415
} else
@@ -1485,23 +1465,23 @@ err_t bte_hci_patch_complete(void *arg,struct hci_pcb *pcb,u8_t ogf,u8_t ocf,u8_
14851465

14861466
LOG("bte_hci_patch_complete(%02x,%02x,%02x)\n",ogf,ocf,result);
14871467
switch(ogf) {
1488-
case HCI_INFO_PARAM:
1489-
if(ocf==HCI_READ_BUFFER_SIZE) {
1468+
case HCI_INFO_PARAM_OGF:
1469+
if(ocf==HCI_R_BUF_SIZE_OCF) {
14901470
if(result==HCI_SUCCESS) {
14911471
hci_write_cod(dev_cod);
14921472
} else
14931473
err = ERR_CONN;
1494-
} else if(ocf==HCI_READ_LOCAL_VERSION) {
1474+
} else if(ocf==HCI_R_LOC_VERS_INFO_OCF) {
14951475
if(result==HCI_SUCCESS) {
14961476
hci_read_bd_addr();
14971477
} else
14981478
err = ERR_CONN;
1499-
} else if(ocf==HCI_READ_BD_ADDR) {
1479+
} else if(ocf==HCI_R_BD_ADDR_OCF) {
15001480
if(result==HCI_SUCCESS) {
15011481
hci_read_local_features();
15021482
} else
15031483
err = ERR_CONN;
1504-
} else if(ocf==HCI_READ_LOCAL_FEATURES) {
1484+
} else if(ocf==HCI_R_LOC_FEAT_OCF) {
15051485
if(result==HCI_SUCCESS) {
15061486
hci_cmd_complete(NULL);
15071487
return __bte_cmdfinish(state,ERR_OK);
@@ -1510,27 +1490,27 @@ err_t bte_hci_patch_complete(void *arg,struct hci_pcb *pcb,u8_t ogf,u8_t ocf,u8_
15101490
}
15111491
break;
15121492
case HCI_HC_BB_OGF:
1513-
if(ocf==HCI_RESET) {
1493+
if(ocf==HCI_RESET_OCF) {
15141494
if(result==HCI_SUCCESS) {
15151495
hci_read_buffer_size();
15161496
} else
15171497
err = ERR_CONN;
1518-
} else if(ocf==HCI_WRITE_COD) {
1498+
} else if(ocf==HCI_W_COD_OCF) {
15191499
if(result==HCI_SUCCESS) {
15201500
hci_write_local_name((u8_t*)"",1);
15211501
} else
15221502
err = ERR_CONN;
1523-
} else if(ocf==HCI_WRITE_LOCAL_NAME) {
1503+
} else if(ocf==HCI_W_LOCAL_NAME_OCF) {
15241504
if(result==HCI_SUCCESS) {
15251505
hci_write_pin_type(0x00);
15261506
} else
15271507
err = ERR_CONN;
1528-
} else if(ocf==HCI_WRITE_PIN_TYPE) {
1508+
} else if(ocf==HCI_W_PIN_TYPE_OCF) {
15291509
if(result==HCI_SUCCESS) {
15301510
hci_host_buffer_size();
15311511
} else
15321512
err = ERR_CONN;
1533-
} else if(ocf==HCI_HOST_BUF_SIZE) {
1513+
} else if(ocf==HCI_HOST_BUF_SIZE_OCF) {
15341514
if(result==HCI_SUCCESS) {
15351515
hci_read_local_version();
15361516
} else
@@ -1564,37 +1544,37 @@ err_t bte_hci_initsub_complete(void *arg,struct hci_pcb *pcb,u8_t ogf,u8_t ocf,u
15641544
LOG("bte_hci_initsub_complete(%02x,%02x)\n",ogf,ocf);
15651545
switch(ogf) {
15661546
case HCI_HC_BB_OGF:
1567-
if(ocf==HCI_WRITE_INQUIRY_MODE) {
1547+
if(ocf==HCI_W_INQUIRY_MODE_OCF) {
15681548
if(result==HCI_SUCCESS) {
15691549
hci_write_page_scan_type(0x01);
15701550
} else
15711551
err = ERR_CONN;
1572-
} else if(ocf==HCI_WRITE_PAGE_SCAN_TYPE) {
1552+
} else if(ocf==HCI_W_PAGE_SCAN_TYPE_OCF) {
15731553
if(result==HCI_SUCCESS) {
15741554
hci_write_inquiry_scan_type(0x01);
15751555
} else
15761556
err = ERR_CONN;
1577-
} else if(ocf==HCI_WRITE_INQUIRY_SCAN_TYPE) {
1557+
} else if(ocf==HCI_W_INQUIRY_SCAN_TYPE_OCF) {
15781558
if(result==HCI_SUCCESS) {
15791559
hci_write_cod(dev_cod);
15801560
} else
15811561
err = ERR_CONN;
1582-
} else if(ocf==HCI_WRITE_COD) {
1562+
} else if(ocf==HCI_W_COD_OCF) {
15831563
if(result==HCI_SUCCESS) {
15841564
hci_write_page_timeout(0x8000);
15851565
} else
15861566
err = ERR_CONN;
1587-
} else if(ocf==HCI_WRITE_PAGE_TIMEOUT) {
1567+
} else if(ocf==HCI_W_PAGE_TIMEOUT_OCF) {
15881568
if(result==HCI_SUCCESS) {
15891569
hci_write_local_name((u8_t*)"Wii",4);
15901570
} else
15911571
err = ERR_CONN;
1592-
} else if(ocf==HCI_WRITE_LOCAL_NAME) {
1572+
} else if(ocf==HCI_W_LOCAL_NAME_OCF) {
15931573
if(result==HCI_SUCCESS) {
15941574
hci_write_scan_enable(0x02);
15951575
} else
15961576
err = ERR_CONN;
1597-
} else if(ocf==HCI_WRITE_SCAN_ENABLE) {
1577+
} else if(ocf==HCI_W_SCAN_EN_OCF) {
15981578
if(result==HCI_SUCCESS) {
15991579
hci_write_authentication_enable(0x01);
16001580
} else

0 commit comments

Comments
 (0)