Packet Downlink Assigment now uses ARFCN/TN of current BTS layout

Now the MS receives dowlink LLC frames.

3 files changed, 19 insertions, 14 deletions

diff --git a/src/gprs_bssgp_pcu.cpp b/src/gprs_bssgp_pcu.cpp
index f40d2a6f..4cc69e4f 100644
--- a/src/gprs_bssgp_pcu.cpp
+++ b/src/gprs_bssgp_pcu.cpp
@@ -30,6 +30,7 @@ int gprs_bssgp_pcu_rx_dl_ud(struct msgb *msg, struct tlv_parsed *tp)
 	struct bssgp_ud_hdr *budh;
 	int tfi;
 	int i = 0;
+	uint8_t trx, ts;
 
 	budh = (struct bssgp_ud_hdr *)msgb_bssgph(msg);
 	struct gprs_rlcmac_tbf *tbf;
@@ -38,8 +39,14 @@ int gprs_bssgp_pcu_rx_dl_ud(struct msgb *msg, struct tlv_parsed *tp)
 	if (tfi < 0) {
 		return tfi;
 	}
+
 	/* FIXME: select right TRX/TS */
-	tbf = tbf_alloc(tfi, 0, 0);
+	if (select_pdch(&trx, &ts)) {
+		LOGP(DRLCMAC, LOGL_NOTICE, "No PDCH ressource\n");
+		/* FIXME: send reject */
+		return -EBUSY;
+	}
+	tbf = tbf_alloc(tfi, trx, ts);
 	tbf->direction = GPRS_RLCMAC_DL_TBF;
 	tbf->state = GPRS_RLCMAC_WAIT_DATA_SEQ_START;
 	tbf->tlli = ntohl(budh->tlli);
diff --git a/src/gprs_rlcmac.cpp b/src/gprs_rlcmac.cpp
index a40e80d6..8f385ebb 100644
--- a/src/gprs_rlcmac.cpp
+++ b/src/gprs_rlcmac.cpp
@@ -166,10 +166,11 @@ static void gprs_rlcmac_enqueue_block(bitvec *block, int len)
 	msgb_enqueue(&block_queue, msg);
 }
 
-void  write_packet_downlink_assignment(bitvec * dest, uint8_t tfi, uint32_t tlli, uint8_t tn, uint8_t ta, uint8_t tsc)
+void  write_packet_downlink_assignment(bitvec * dest, uint8_t tfi, uint32_t tlli, uint16_t arfcn, uint8_t tn, uint8_t ta, uint8_t tsc)
 {
 	// TODO We should use our implementation of encode RLC/MAC Control messages.
 	unsigned wp = 0;
+	int i;
 	bitvec_write_field(dest, wp,0x1,2);  // Payload Type
 	bitvec_write_field(dest, wp,0x0,2);  // Uplink block with TDMA framenumber
 	bitvec_write_field(dest, wp,0x1,1);  // Suppl/Polling Bit
@@ -187,7 +188,7 @@ void  write_packet_downlink_assignment(bitvec * dest, uint8_t tfi, uint32_t tlli
 	bitvec_write_field(dest, wp,0x0,1); // RLC acknowledged mode
 
 	bitvec_write_field(dest, wp,0x0,1); // the network establishes no new downlink TBF for the mobile station
-	bitvec_write_field(dest, wp,0x1,8); // timeslot 7
+	bitvec_write_field(dest, wp,0x80 >> tn,8); // timeslot(s)
 
 	bitvec_write_field(dest, wp,0x1,1); // switch TIMING_ADVANCE_VALUE = on
 	bitvec_write_field(dest, wp,ta,6); // TIMING_ADVANCE_VALUE
@@ -198,22 +199,16 @@ void  write_packet_downlink_assignment(bitvec * dest, uint8_t tfi, uint32_t tlli
 
 	bitvec_write_field(dest, wp,tsc,3); // Training Sequence Code (TSC) = 2
 	bitvec_write_field(dest, wp,0x0,2); // ARFCN = present
-	bitvec_write_field(dest, wp,599,10); // ARFCN
+	bitvec_write_field(dest, wp,arfcn,10); // ARFCN
 
 	bitvec_write_field(dest, wp,0x1,1); // switch TFI   : on
 	bitvec_write_field(dest, wp,tfi,5);// TFI
 
 	bitvec_write_field(dest, wp,0x1,1); // Power Control Parameters IE = present
 	bitvec_write_field(dest, wp,0x0,4); // ALPHA power control parameter
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN0 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN1 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN2 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN3 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN4 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN5 = off
-	bitvec_write_field(dest, wp,0x0,1); // switch GAMMA_TN6 = off
-	bitvec_write_field(dest, wp,0x1,1); // switch GAMMA_TN7 = on
-	bitvec_write_field(dest, wp,0x0,5); // GAMMA_TN7
+	for (i = 0; i < 8; i++)
+		bitvec_write_field(dest, wp,(tn == i),1); // switch GAMMA_TN[i] = on or off
+	bitvec_write_field(dest, wp,0x0,5); // GAMMA_TN[tn]
 
 	bitvec_write_field(dest, wp,0x0,1); // TBF Starting TIME IE not present
 	bitvec_write_field(dest, wp,0x0,1); // Measurement Mapping struct not present
@@ -894,7 +889,8 @@ void gprs_rlcmac_packet_downlink_assignment(gprs_rlcmac_tbf *tbf)
 	LOGP(DRLCMAC, LOGL_NOTICE, "TX: [PCU -> BTS] TFI: %u TLLI: 0x%08x Packet DL Assignment\n", tbf->tfi, tbf->tlli);
 	bitvec *packet_downlink_assignment_vec = bitvec_alloc(23);
 	bitvec_unhex(packet_downlink_assignment_vec, "2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b2b");
-	write_packet_downlink_assignment(packet_downlink_assignment_vec, tbf->tfi, tbf->tlli, tbf->ts, tbf->ta, tbf->tsc);
+	printf("tbf->ts %d\n", tbf->ts);
+	write_packet_downlink_assignment(packet_downlink_assignment_vec, tbf->tfi, tbf->tlli, tbf->arfcn, tbf->ts, tbf->ta, tbf->tsc);
 	RlcMacDownlink_t * packet_downlink_assignment = (RlcMacDownlink_t *)malloc(sizeof(RlcMacDownlink_t));
 	LOGP(DRLCMAC, LOGL_NOTICE, "+++++++++++++++++++++++++ TX : Packet Downlink Assignment +++++++++++++++++++++++++\n");
 	decode_gsm_rlcmac_downlink(packet_downlink_assignment_vec, packet_downlink_assignment);
diff --git a/src/gprs_rlcmac.h b/src/gprs_rlcmac.h
index d18c516e..83ef7bd9 100644
--- a/src/gprs_rlcmac.h
+++ b/src/gprs_rlcmac.h
@@ -66,6 +66,8 @@ struct gprs_rlcmac_tbf {
 
 extern struct llist_head gprs_rlcmac_tbfs;
 
+int select_pdch(uint8_t *_trx, uint8_t *_ts);
+
 int tfi_alloc();
 
 struct gprs_rlcmac_tbf *tbf_alloc(uint8_t tfi, uint8_t trx, uint8_t ts);